Skip to content

Commit 6ce85ac

Browse files
authored
Update allowed-actions.js (#17873)
1 parent c0f5e59 commit 6ce85ac

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = [
2424
'juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9',
2525
'juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512',
2626
'lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8',
27-
'pascalgn/automerge-action@c9bd182',
27+
'pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07', //pascalgn/automerge@0.12.0
2828
'peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326',
2929
'peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd',
3030
'peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43',

.github/workflows/automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
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')
2424
steps:
2525
- name: automerge
26-
uses: 'pascalgn/automerge-action@c9bd182'
26+
uses: 'pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07'
2727
env:
2828
GITHUB_TOKEN: '${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}'
2929
MERGE_METHOD_LABELS: 'automerge=merge,autosquash=squash'

0 commit comments

Comments
 (0)