Skip to content

Commit a412324

Browse files
author
Ivan Sim
committed
Update Makefile so bash commands failed on-error
Signed-off-by: Ivan Sim <[email protected]>
1 parent a90aaab commit a412324

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

Makefile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ core:
4747
cli:
4848
if [ "$(BUILD_OS)" = "windows" ]; then \
4949
extension=".exe" ;\
50-
fi ;\
51-
CGO_ENABLED=0 GOOS="$(BUILD_OS)" GOARCH="$(BUILD_ARCH)" go build -ldflags="-X 'main.Version=$(VERSION)' -X 'main.Commit=$(GIT_COMMIT)'" -o "$(TARGET_BIN_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION)$${extension}" ./cli/cmd ;\
52-
shasum -a256 "$(TARGET_BIN_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION)" | awk '{print $$1}' > "$(TARGET_BIN_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).sha256"
50+
fi && \
51+
CGO_ENABLED=0 GOOS="$(BUILD_OS)" GOARCH="$(BUILD_ARCH)" go build -ldflags="-X 'main.Version=$(VERSION)' -X 'main.Commit=$(GIT_COMMIT)'" -o "$(TARGET_BIN_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION)$${extension}" ./cli/cmd &&\
52+
shasum -a256 "$(TARGET_BIN_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION)"$${extension} | awk '{print $$1}' > "$(TARGET_BIN_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).sha256"
5353

5454
.PHONY: dist
5555
dist:
@@ -62,25 +62,25 @@ dist:
6262

6363
.PHONY: release
6464
release:
65-
rm -rf "$(TARGET_RELEASE_DIR)" ;\
66-
mkdir -p "$(TARGET_RELEASE_DIR)" ;\
65+
rm -rf "$(TARGET_RELEASE_DIR)" && \
66+
mkdir -p "$(TARGET_RELEASE_DIR)" && \
6767
for os in linux darwin windows ; do \
68-
$(MAKE) BUILD_OS="$${os}" BUILD_ARCH="amd64" TARGET_BIN_DIR="$(TARGET_RELEASE_DIR)" cli;\
68+
$(MAKE) BUILD_OS="$${os}" BUILD_ARCH="amd64" TARGET_BIN_DIR="$(TARGET_RELEASE_DIR)" cli && \
6969
$(MAKE) BUILD_OS="$${os}" BUILD_ARCH="amd64" plugin ;\
70-
done ;\
71-
$(MAKE) TARGET_BIN_DIR="$(TARGET_RELEASE_DIR)" core dist ;\
70+
done && \
71+
$(MAKE) TARGET_BIN_DIR="$(TARGET_RELEASE_DIR)" core dist
7272

7373
.PHONY: plugin
7474
plugin:
75-
mkdir -p "$(TARGET_PLUGINS_DIR)" ;\
75+
mkdir -p "$(TARGET_PLUGINS_DIR)" && \
7676
if [ "$(BUILD_OS)" = "windows" ]; then \
7777
extension=".exe" ;\
78-
fi ;\
79-
cp LICENSE "$(TARGET_PLUGINS_DIR)"
80-
cp "$(TARGET_RELEASE_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION)$${extension}" "$(TARGET_PLUGINS_DIR)/kubectl-promdump$${extension}" ;\
81-
tar -C "$(TARGET_PLUGINS_DIR)" -czvf "$(TARGET_PLUGINS_DIR)/kubectl-promdump-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).tar.gz" kubectl-promdump$${extension} LICENSE ;\
82-
rm "$(TARGET_PLUGINS_DIR)/kubectl-promdump$${extension}" ;\
83-
shasum -a256 $(TARGET_PLUGINS_DIR)/kubectl-promdump-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).tar.gz | awk '{print $$1}' > $(TARGET_PLUGINS_DIR)/kubectl-promdump-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).tar.gz.sha256 ;\
78+
fi && \
79+
cp LICENSE "$(TARGET_PLUGINS_DIR)" && \
80+
cp "$(TARGET_RELEASE_DIR)/cli-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION)$${extension}" "$(TARGET_PLUGINS_DIR)/kubectl-promdump$${extension}" && \
81+
tar -C "$(TARGET_PLUGINS_DIR)" -czvf "$(TARGET_PLUGINS_DIR)/kubectl-promdump-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).tar.gz" kubectl-promdump$${extension} LICENSE && \
82+
rm "$(TARGET_PLUGINS_DIR)/kubectl-promdump$${extension}" && \
83+
shasum -a256 $(TARGET_PLUGINS_DIR)/kubectl-promdump-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).tar.gz | awk '{print $$1}' > $(TARGET_PLUGINS_DIR)/kubectl-promdump-$(BUILD_OS)-$(BUILD_ARCH)-$(VERSION).tar.gz.sha256
8484

8585
.PHONY: test
8686
test/prometheus-repos:

0 commit comments

Comments
 (0)