From 9a9e4284d947dc359fbd4522283950599ca60e4a Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Thu, 8 Mar 2018 22:12:29 +0100 Subject: [PATCH] Modified deploy.sh to set the tag on master, not on stable, so that `git describe` for versions built from master gives usable output. --- deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index 30b038a..2d71306 100755 --- a/deploy.sh +++ b/deploy.sh @@ -40,15 +40,15 @@ sed -i "s/ENV JAR_VERSION .\+/ENV JAR_VERSION $VERSION/g" Dockerfile || error "C echo "Committing the new Dockerfile..." git commit -m "Bumping the version to $VERSION" Dockerfile || error "Couldn't commit the new Dockerfile." +echo "Tagging the new version..." +git tag -a "$VERSION" -m "Version $VERSION" || error + echo "Checking out stable..." git checkout stable || error echo "Merging master into stable..." git merge --no-ff -m "Merging master into stable for version $VERSION" master || error -echo "Tagging the new version..." -git tag -a "$VERSION" -m "Version $VERSION" || error - echo "Pushing all to Github..." git push --all || error