This commit is contained in:
Yair Morgenstern
2023-11-28 12:20:12 +02:00
parent 9d411a16bc
commit c3216e96eb

View File

@ -43,7 +43,7 @@ jobs:
- name: Merge Pull Request
uses: "actions/github-script@v5"
with:
github-token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
github-token: ${{ secrets.ACTIONS_ACCESS_TOKEN }} # Required because default workflow token can't merge PRs
script: |
const repository = context.repo
await github.rest.pulls.merge({
@ -53,12 +53,6 @@ jobs:
repo: repository.repo,
})
# Even though the PR was "merged", the head is still not updated - takes Github a while longer
# Since there's no simple way to poll for this, we just wait
# - uses: GuillaumeFalourd/wait-sleep-action@v1
# with:
# time: '60' # In seconds
- uses: actions/checkout@v3
with: # Required for triggering the deploy on tags added by this automation
# See https://github.com/stefanzweifel/git-auto-commit-action#commits-made-by-this-action-do-not-trigger-new-workflow-runs