Slightly better tagandrelease.sh

Webstrates · Mar 24, 2018 · 814a86d · 814a86d
1 parent 00befe9
commit 814a86d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tagandrelease.sh b/tagandrelease.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-git tag -a "$1" -m "$2" && git push && git push --tags || true
+git co master && git merge develop && git tag -a "$1" -m "$2" && git push && git push --tags && git co develop || true
 rm -fr out && mkdir out
 gox --output "out/{{.Dir}}_$1_{{.OS}}_{{.Arch}}"
 ghr -u Webstrates -r golem-herder "$1" out