Merge branch 'master' into feature/lock-step-reason

Author: mPokornyETM

.github/workflows/rebase-open-prs.yml

@@ -1,6 +1,4 @@
-# Rebase all open PRs when master is updated
-# This keeps PRs up-to-date automatically
-name: Rebase Open PRs
+name: Rebase open PRs
 
 on:
   push:
@@ -12,20 +10,11 @@ permissions:
   pull-requests: write
 
 jobs:
-  rebase-open-prs:
+  rebase-prs:
     runs-on: ubuntu-latest
     steps:
-      - name: Rebase all open PRs
+      - uses: mPokornyETM/rebase-open-prs-action@v1
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_REPO: ${{ github.repository }}
-        run: |
-          gh pr list --state open --json number,author,isDraft --jq '.[] | select(.isDraft == false) | "\(.number) \(.author.login)"' | while read pr author; do
-            if [ "$author" = "dependabot[bot]" ]; then
-              echo "Requesting rebase for Dependabot PR #$pr"
-              gh pr comment "$pr" --body "@dependabot rebase"
-            else
-              echo "Updating branch for PR #$pr"
-              gh pr update-branch --rebase "$pr" || true
-            fi
-          done
+          GH_TOKEN: ${{ github.token }}
+        with:
+          github-token: ${{ github.token }}

pom.xml

@@ -71,7 +71,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>6210.v69ea_fd8a_f010</version>
+        <version>6237.v4da_61a_4a_19e5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>