Skip releases like good people do

ivanilves · Nov 9, 2017 · 6e29101 · 6e29101
1 parent 2b6b32d
commit 6e29101
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -118,11 +118,15 @@ validate-release:
 
 deploy: validate-release
 deploy: TAG=$(shell cat ./dist/release/TAG)
-deploy: SKIP=$(shell git show | grep -i "Merge.*NORELEASE" >/dev/null && echo "true" || echo "false")
+deploy: SKIP_RELEASE=$(shell git show | grep -i "Merge.*NORELEASE" >/dev/null && echo "true" || echo "false")
 deploy:
-	test "${SKIP}" == "false" && test -n "${GITHUB_TOKEN}" && git tag ${TAG} && git push --tags
-	GITHUB_TOKEN=${GITHUB_TOKEN} ./scripts/github-create-release.sh ./dist/release
-	GITHUB_TOKEN=${GITHUB_TOKEN} ./scripts/github-upload-assets.sh ${TAG} ./dist/assets
+	if [[ "${SKIP_RELEASE}" == "false" ]]; then \
+		test -n "${GITHUB_TOKEN}" && git tag ${TAG} && git push --tags \
+		&& GITHUB_TOKEN=${GITHUB_TOKEN} ./scripts/github-create-release.sh ./dist/release \
+		&& GITHUB_TOKEN=${GITHUB_TOKEN} ./scripts/github-upload-assets.sh ${TAG} ./dist/assets; \
+	else \
+		echo "Release skipped! No problem, this is expected ;)"; \
+	fi
 
 docker: DOCKER_REPO:=ivanilves/lstags
 docker: RELEASE_TAG:=latest