forked from platypush/platypush
Added git checkout and rebase commands to sync-stable-branch step.
This commit is contained in:
parent
ae66e9c205
commit
fd7037d048
1 changed files with 4 additions and 1 deletions
|
@ -84,8 +84,11 @@ steps:
|
||||||
- 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
|
||||||
|
|
||||||
# Push to the `stable` branch
|
# Merge and push to the `stable` branch
|
||||||
|
- git checkout stable
|
||||||
|
- git rebase master
|
||||||
- git push -u origin stable
|
- git push -u origin stable
|
||||||
|
- git checkout master
|
||||||
|
|
||||||
# Restore the original git configuration
|
# Restore the original git configuration
|
||||||
- mv /tmp/git.config.orig $GIT_CONF
|
- mv /tmp/git.config.orig $GIT_CONF
|
||||||
|
|
Loading…
Reference in a new issue