diff --git a/.drone/sync-stable-branch.sh b/.drone/sync-stable-branch.sh index cc8ae9123..dfdb63173 100755 --- a/.drone/sync-stable-branch.sh +++ b/.drone/sync-stable-branch.sh @@ -4,11 +4,15 @@ . .drone/macros/configure-ssh.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 git checkout stable || git checkout -b stable -git rebase master +git rebase origin master git push -u origin stable -git checkout master +git checkout origin master # Restore the original git configuration mv "$TMP_GIT_CONF" "$GIT_CONF"