From e340be1df5eb7b32ed679205b0b5319d0973bb42 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen <santeri.hurnanen@fame.fi>
Date: Thu, 19 Oct 2023 17:17:41 +0300
Subject: [PATCH 1/3] UHF-9113: sync changes to v4 branch

---
 .github/workflows/v4-sync.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/v4-sync.yml

diff --git a/.github/workflows/v4-sync.yml b/.github/workflows/v4-sync.yml
new file mode 100644
index 000000000..d2cb66c61
--- /dev/null
+++ b/.github/workflows/v4-sync.yml
@@ -0,0 +1,22 @@
+name: v4 sync
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create pull request
+        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 }}

From ad1a148a802ded3832badfc6323379476ac14e40 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen <santeri.hurnanen@fame.fi>
Date: Thu, 19 Oct 2023 19:03:25 +0300
Subject: [PATCH 2/3] Add core version requirement

The patches in this repository not apply in Drupal >= 10
---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index f9ea7ac24..4b04c9fcb 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,7 @@
     "minimum-stability": "dev",
     "require": {
         "ext-curl": "*",
+        "drupal/core": "^9.5",
         "drupal/admin_toolbar": "^3.0",
         "drupal/allowed_formats": "^2.0",
         "drupal/config_ignore": "^2.3",

From 7e2f4635d50f58c55ddcf073860fde16e4d25117 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen <santeri.hurnanen@fame.fi>
Date: Mon, 23 Oct 2023 09:07:56 +0300
Subject: [PATCH 3/3] UHF-9113: Rebase 4.x instead of PR

---
 .github/workflows/v4-sync.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/v4-sync.yml b/.github/workflows/v4-sync.yml
index d2cb66c61..a04938ec4 100644
--- 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