Skip to content

Commit

Permalink
Merge pull request #10349 from DestinyItemManager/dependabot-pat
Browse files Browse the repository at this point in the history
automerged PRs need PAT not TOKEN to continue running other actions
  • Loading branch information
delphiactual authored Apr 21, 2024
2 parents 6c153eb + 2e64b0f commit f359cdc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/d2ai-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ permissions:
pull-requests: write

jobs:
dependabot:
d2ai-automerge:
runs-on: ubuntu-latest
if: github.actor == 'd2ai-bot'
steps:
- name: Enable auto-merge for d2ai PRs
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
deploy_beta:
needs: dependabot
uses: DestinyItemManager/DIM/.github/workflows/deploy-beta.yml@master
GITHUB_TOKEN: ${{secrets.DEPENDABOT_PAT}}
4 changes: 2 additions & 2 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
id: metadata
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
github-token: "${{ secrets.DEPENDABOT_PAT }}"
- name: Enable auto-merge for Dependabot PRs
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
GITHUB_TOKEN: ${{ secrets.DEPENDABOT_PAT }}
1 change: 0 additions & 1 deletion .github/workflows/deploy-beta.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Deploy Beta

on:
workflow_call:
workflow_dispatch:
push:
branches:
Expand Down

0 comments on commit f359cdc

Please sign in to comment.