Added git checkout and rebase commands to sync-stable-branch step.

This commit is contained in:
Fabio Manganiello 2023-10-01 23:31:22 +02:00
parent ae66e9c205
commit fd7037d048
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774

View file

@ -84,8 +84,11 @@ steps:
- git remote rm origin
- git remote add origin git@git.platypush.tech:platypush/platypush.git
# Push to the `stable` branch
# Merge and push to the `stable` branch
- git checkout stable
- git rebase master
- git push -u origin stable
- git checkout master
# Restore the original git configuration
- mv /tmp/git.config.orig $GIT_CONF