Skip to content

Commit 7b641f1

Browse files
committed
Fix Dependabot auto-merge workflow
1 parent f5c215a commit 7b641f1

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/dependabot_auto_merge.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ jobs:
1919
env:
2020
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2121
run: |
22+
set -euo pipefail
2223
BRANCH_NAME="${{ github.event.workflow_run.head_branch }}"
23-
PR_NUMBER=$(gh pr list --state open --head "${BRANCH_NAME}" --json number --jq '.[0].number // empty')
24+
PR_NUMBER=$(gh pr list --repo "${GITHUB_REPOSITORY}" --state open --head "${BRANCH_NAME}" --json number --jq '.[0].number // empty')
2425
if [ -z "${PR_NUMBER}" ]; then
2526
echo "No open Dependabot PR found for ${BRANCH_NAME}." >> "$GITHUB_STEP_SUMMARY"
2627
exit 0
@@ -33,7 +34,8 @@ jobs:
3334
env:
3435
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3536
run: |
36-
gh pr view "${{ steps.pr.outputs.pr_number }}" --json number,isDraft,author,url,labels > pr.json
37+
set -euo pipefail
38+
gh pr view "${{ steps.pr.outputs.pr_number }}" --repo "${GITHUB_REPOSITORY}" --json number,isDraft,author,url,labels > pr.json
3739
python3 - <<'PY'
3840
import json
3941
import os
@@ -42,7 +44,7 @@ jobs:
4244
pr = json.loads(Path("pr.json").read_text(encoding="utf-8"))
4345
author = (pr.get("author") or {}).get("login")
4446
labels = {item.get("name", "") for item in pr.get("labels", [])}
45-
should_merge = author == "dependabot[bot]" and not pr.get("isDraft")
47+
should_merge = author in {"dependabot[bot]", "app/dependabot"} and not pr.get("isDraft")
4648
reason = "ready" if should_merge else "not_dependabot_or_draft"
4749
4850
summary_lines = [
@@ -68,4 +70,4 @@ jobs:
6870
if: steps.merge_guard.outputs.should_merge == 'true'
6971
env:
7072
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71-
run: gh pr merge "${{ steps.pr.outputs.pr_number }}" --rebase --delete-branch
73+
run: gh pr merge "${{ steps.pr.outputs.pr_number }}" --repo "${GITHUB_REPOSITORY}" --rebase --delete-branch

0 commit comments

Comments
 (0)