fabian/telegram_backup
1
0
Fork 0
mirror of https://github.com/fabianonline/telegram_backup.git synced 2024-11-22 16:56:16 +00:00
Code Issues Releases Wiki Activity

Modified deploy.sh to set the tag on master, not on stable, so that git describe for versions built from master gives usable output.

Browse Source
This commit is contained in:
Fabian Schlenz 2018-03-08 22:12:29 +01:00
parent 3c5a8e9d38
commit 9a9e4284d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deploy.sh
View File

@ -40,15 +40,15 @@ sed -i "s/ENV JAR_VERSION .\+/ENV JAR_VERSION $VERSION/g" Dockerfile || error "C
echo "Committing the new Dockerfile..." echo "Committing the new Dockerfile..."
git commit -m "Bumping the version to $VERSION" Dockerfile || error "Couldn't commit 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..." echo "Checking out stable..."
git checkout stable || error git checkout stable || error
echo "Merging master into stable..." echo "Merging master into stable..."
git merge --no-ff -m "Merging master into stable for version $VERSION" master || error 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..." echo "Pushing all to Github..."
git push --all || error git push --all || error