Skip to content

Commit

Permalink
Merge pull request #155 from kachick/prefer-pat-for-merge
Browse files Browse the repository at this point in the history
Use provided PAT for merging phase
  • Loading branch information
pankona authored Jun 28, 2023
2 parents 8752120 + 0d6e9d4 commit eb67111
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/merge-bot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@ jobs:
- uses: actions/checkout@v3
- name: Wait other jobs
# if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
uses: kachick/wait-other-jobs@v1.2.1
uses: kachick/wait-other-jobs@v1.3.0
timeout-minutes: 30
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
- name: Approve and merge
# if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: '${{ secrets.PERSONAL_ACCESS_TOKEN }}'

0 comments on commit eb67111

Please sign in to comment.