diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index 3fb6393b8a..d156603d81 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -24,7 +24,7 @@ module.exports = [ 'juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9', 'juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512', 'lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8', - 'pascalgn/automerge-action@c9bd182', + 'pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07', //pascalgn/automerge@0.12.0 'peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326', 'peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd', 'peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43', diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 412e5f6902..59d26dcb79 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -23,7 +23,7 @@ jobs: if: (contains(github.event.pull_request.labels.*.name, 'automerge') || contains(github.event.pull_request.labels.*.name, 'autosquash')) && (github.repository == 'github/docs-internal' || github.repository == 'github/docs') steps: - name: automerge - uses: 'pascalgn/automerge-action@c9bd182' + uses: 'pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07' env: GITHUB_TOKEN: '${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}' MERGE_METHOD_LABELS: 'automerge=merge,autosquash=squash'