Skip to content

Commit

Permalink
chore(CI): NORELEASE Fix DO_RELEASE quirk
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanilves committed Aug 13, 2018
1 parent 8741b05 commit 73fa900
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ validate-release:
test -f ./dist/release/CHANGELOG.md && grep '^\* ' ./dist/release/CHANGELOG.md >/dev/null
[[ `find dist/assets -mindepth 2 -type f | wc -l` -ge 3 ]]

deploy: DO_RELEASE:=$(shell git show | grep -i "Merge.*NORELEASE" >/dev/null && echo "false" || echo "true")
deploy: DO_RELEASE:=$(shell git log --oneline -n1 | grep -i "Merge.*NORELEASE" >/dev/null && echo "false" || echo "true")
deploy: deploy-github deploy-docker

deploy-github: TAG=$(shell cat ./dist/release/TAG)
Expand Down

0 comments on commit 73fa900

Please sign in to comment.