revil-O/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

[CI/CD] Be explicit about the origin in sync-stable-branch.

Browse source
This commit is contained in:
Fabio Manganiello 2024-05-26 00:56:01 +02:00
parent 0537815721
commit e23664b5e7
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.drone/sync-stable-branch.sh
View file

@ -4,11 +4,15 @@
. .drone/macros/configure-ssh.sh . .drone/macros/configure-ssh.sh
. .drone/macros/configure-gpg.sh . .drone/macros/configure-gpg.sh
# Git configuration
git remote rm origin
git remote add origin git@git.platypush.tech:platypush/platypush.git
# Merge and push to the `stable` branch # Merge and push to the `stable` branch
git checkout stable || git checkout -b stable git checkout stable || git checkout -b stable
git rebase master git rebase origin master
git push -u origin stable git push -u origin stable
git checkout master git checkout origin master
# Restore the original git configuration # Restore the original git configuration
mv "$TMP_GIT_CONF" "$GIT_CONF" mv "$TMP_GIT_CONF" "$GIT_CONF"