Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-03-26 23:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow tools/build-auto-update.sh to work on non-master branch (with warning)

Browse Source
This commit is contained in:
catbref 2020-05-27 11:08:56 +01:00
parent 6eea7c2aa1
commit ca0deb2bf6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/build-auto-update.sh
View File

@ -18,7 +18,8 @@ branch_name=${branch_name##refs/heads/}
echo "Current git branch: ${branch_name}" echo "Current git branch: ${branch_name}"
if [ "${branch_name}" != "master" ]; then if [ "${branch_name}" != "master" ]; then
echo "Unexpected current branch '${branch_name}' - expecting 'master'" echo "Unexpected current branch '${branch_name}' - expecting 'master'"
exit 1 echo "CTRL-C within 5 seconds to abort"
sleep 5
fi fi
# Extract short-form commit hash # Extract short-form commit hash
@ -77,5 +78,5 @@ git add ${project}.update
git commit --message "XORed, auto-update JAR based on commit ${short_hash}" git commit --message "XORed, auto-update JAR based on commit ${short_hash}"
git push --set-upstream origin --force-with-lease ${update_branch} git push --set-upstream origin --force-with-lease ${update_branch}
echo "Changing back to 'master' branch" echo "Changing back to '${branch_name}' branch"
git checkout --force master git checkout --force ${branch_name}