Merge pull request #23 from contentful/revert-revery

feat!: use github-actions token for merging PR

Author: jamesmbourne

README.md

@@ -35,10 +35,11 @@ jobs:
     permissions:
       contents: write
       id-token: write
+      pull-request: write
     runs-on: ubuntu-latest
     if: github.actor == 'dependabot[bot]'
     steps:
-      - uses: contentful/github-auto-merge@v1
+      - uses: contentful/github-auto-merge@v2
         with:
           VAULT_URL: ${{ secrets.VAULT_URL }} # this is an organisation level secret, you do not need to add it to your repo
 ```

action.yml

@@ -89,4 +89,6 @@ runs:
         echo "Auto merging PR using method $merge_method"
         gh pr merge --delete-branch "--$merge_method" --auto ${{ github.event.pull_request.html_url }}
       env:
-        GITHUB_TOKEN: ${{ steps.vault.outputs.GITHUB_MERGE_TOKEN }}
+        # Note: The GH_TOKEN env var is required for now, even though it contradicts GH's documentation. If not present we
+        # were seeing an error message like this one: https://github.com/github/docs/issues/21930#issuecomment-1310122605
+        GH_TOKEN: ${{ github.token }}

example.yml

@@ -7,9 +7,10 @@ jobs:
     permissions:
       contents: write
       id-token: write
+      pull-request: write
     runs-on: ubuntu-latest
     if: github.actor == 'dependabot[bot]'
     steps:
-      - uses: contentful/github-auto-merge@v1
+      - uses: contentful/github-auto-merge@v2
         with:
           VAULT_URL: ${{ secrets.VAULT_URL }} # this is an organisation level secret, you do not need to add it to your repo