diff --git a/tagandrelease.sh b/tagandrelease.sh index d318f19..6816f19 100755 --- 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