From c8c33b92ec290b5306bbedde9d98cea5f5eb650a Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Fri, 5 Dec 2025 17:50:47 +0100
Subject: [PATCH 1/2] [#2871] Set up auto-rebase for WIP branches

---
 .github/workflows/auto-rebase.yml | 70 +++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 .github/workflows/auto-rebase.yml

diff --git a/.github/workflows/auto-rebase.yml b/.github/workflows/auto-rebase.yml
new file mode 100644
index 000000000..69d4582ca
--- /dev/null
+++ b/.github/workflows/auto-rebase.yml
@@ -0,0 +1,70 @@
+name: Auto Rebase Work Branches
+
+on:
+  push:
+    branches:
+      - main
+      - "4.1"
+      - "3.1"
+      - "3.2"
+      - "2.4"
+  workflow_dispatch:
+
+jobs:
+  auto-rebase:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        mapping:
+          - base: main
+            branch: wip/4.2
+          - base: 4.1
+            branch: wip/4.1
+          - base: 3.1
+            branch: wip/3.1
+          - base: 3.2
+            branch: wip/3.2
+          - base: 2.4
+            branch: wip/2.4
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install GitHub CLI
+        uses: cli/cli-action@v2
+
+      - name: Set up Git
+        run: |
+          git config user.name "github-actions"
+          git config user.email "github-actions@github.com"
+
+      - name: Fetch branches
+        run: |
+          git fetch origin ${ {matrix.mapping.base} }
+          git fetch origin ${ {matrix.mapping.branch} }
+
+      - name: Rebase work branch on base branch
+        run: |
+          BASE=${{ matrix.mapping.base }}
+          BRANCH=${{ matrix.mapping.branch }}
+
+          echo "Rebasing $BRANCH onto $BASE"
+
+          git checkout $BRANCH
+          git rebase origin/$BASE || {
+            echo "Rebase conflict detected on $BRANCH. Aborting."
+            git rebase --abort
+            exit 1
+          }
+
+      - name: Push rebased branch
+        run: |
+          BRANCH=${{ matrix.mapping.branch }}
+          echo "Pushing updated branch: $BRANCH"
+          git push --force-with-lease origin $BRANCH
+

From 3737dd452a5cbc3b23ebeb99e9baa84cd04c0bcf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:51:53 +0000
Subject: [PATCH 2/2] Bump actions/checkout in the workflow-actions group
 across 1 directory

Bumps the workflow-actions group with 1 update in the / directory: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 4 to 6
- [Release notes](https://github.com/actions/checkout/releases)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: workflow-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/auto-rebase.yml | 2 +-
 .github/workflows/build.yml       | 6 +++---
 .github/workflows/codeql.yml      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/auto-rebase.yml b/.github/workflows/auto-rebase.yml
index 69d4582ca..5700864a8 100644
--- a/.github/workflows/auto-rebase.yml
+++ b/.github/workflows/auto-rebase.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3565742c4..3ef52ef19 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,7 +83,7 @@ jobs:
           - 5432:5432
     steps:
       - name: Checkout ${{ inputs.branch }}
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
         with:
           ref: ${{ inputs.branch }}
       - name: Get year/month for cache key
@@ -132,7 +132,7 @@ jobs:
         db: [ 'MariaDB', 'MySQL', 'PostgreSQL', 'MSSQLServer', 'CockroachDB', 'Db2', 'Oracle' ]
     steps:
       - name: Checkout ${{ inputs.branch }}
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
         with:
           ref: ${{ inputs.branch }}
       - name: Get year/month for cache key
@@ -196,7 +196,7 @@ jobs:
           - { name: "26-ea", java_version_numeric: 26, from: 'jdk.java.net', jvm_args: '--enable-preview' }
     steps:
       - name: Checkout ${{ inputs.branch }}
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
         with:
           ref: ${{ inputs.branch }}
       - name: Get year/month for cache key
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 0f0092428..776e455de 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
 
       - name: Setup Java
         uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0