ci: use the current branch for rebase

archtechx · Jan 2, 2025 · a784ee0 · a784ee0
1 parent c5f187d
commit a784ee0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/extensions.yml b/.github/workflows/extensions.yml
@@ -56,8 +56,9 @@ jobs:
     - name: Push files (Unix)
       if: runner.os != 'Windows'
       run: |
+        CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
         for attempt in {1..3}; do
-          git pull --rebase && git push && exit 0 || {
+          git pull --rebase origin/$CURRENT_BRANCH && git push origin $CURRENT_BRANCH && exit 0 || {
             echo "Attempt $attempt failed. Retrying in 5 seconds..."
             sleep 5
           }