blacklight/platypush
1
0
Fork 0
forked from platypush/platypush
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CI/CD] Do a git fetch beofre checkout/rebase in sync-stable-branch.

Browse source
This commit is contained in:
Fabio Manganiello 2024-05-26 01:26:19 +02:00
parent ee3933dc77
commit 86674ddc28
Signed by: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,12 +7,13 @@
# Git configuration # Git configuration
git remote rm origin git remote rm origin
git remote add origin git@git.platypush.tech:platypush/platypush.git git remote add origin git@git.platypush.tech:platypush/platypush.git
git fetch origin
# 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 origin master git rebase master
git push -u origin stable git push -u origin stable
git checkout origin master git checkout master
# Restore the original git configuration # Restore the original git configuration
mv "$TMP_GIT_CONF" "$GIT_CONF" mv "$TMP_GIT_CONF" "$GIT_CONF"