UHF-9113: Rebase 4.x instead of PR

City-of-Helsinki · Oct 23, 2023 · 7e2f463 · 7e2f463
1 parent ad1a148
commit 7e2f463
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/v4-sync.yml b/.github/workflows/v4-sync.yml
@@ -10,13 +10,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: '4.x'
 
-      - name: Create pull request
+      - name: Rebase 4.x branch
         run: |
-          gh pr create \
-            --base main \
-            --head 4.x \
-            --title "main to 4.x" \
-            --body "Sync changes to 4.x branch" || true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Set git user from the latest commit
+          git config user.name "$(git --no-pager log --format=format:'%an' -n 1)"
+          git config user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
+          git rebase origin/main
+          git push --force