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

2023-10-01 23:31:22 +02:00 · 2023-10-01 23:31:22 +02:00 · fd7037d048
parent ae66e9c205
commit fd7037d048
1 changed files with 4 additions and 1 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -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