Merge pull request #3575 from ingef/reintegrate-main

Reintegrate Main
ingef · Sep 25, 2024 · 3aa7b83 · 3aa7b83
2 parents 17e01ed + 0af5056
commit 3aa7b83
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/reintegrate-master.yml b/.github/workflows/reintegrate-master.yml
@@ -14,8 +14,9 @@ jobs:
     timeout-minutes: 3
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
+          token: ${{ secrets.REPO_SCOPED_TOKEN }}
           submodules: true
       - name: Configure git
         run: |
@@ -38,11 +39,13 @@ jobs:
           --head $REINTEGRATE_BRANCH_NAME
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # Modify the request in the scope of a PAT (an actual user).
+      # This should allow to trigger subsequent actions with the merge commit.
       - name: Modify pull request
         run: >
           gh pr merge
           --merge
           --auto
           --delete-branch
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.REPO_SCOPED_TOKEN }}