Skip to content

Commit ad67250

Browse files
committed
Use repository context for Dependabot PRs
1 parent f594da5 commit ad67250

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

.github/workflows/dependabot-merge.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ jobs:
5959
id: conflict-check
6060
env:
6161
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
GH_REPO: ${{ github.repository }}
6263
PR_NUMBER: ${{ steps.pr.outputs.number }}
6364
run: |
6465
# Get detailed PR info including mergeable state
65-
PR_DATA=$(gh pr view "$PR_NUMBER" --json mergeable,mergeStateStatus)
66+
PR_DATA=$(gh pr view "$PR_NUMBER" --repo "$GH_REPO" --json mergeable,mergeStateStatus)
6667
MERGEABLE=$(echo "$PR_DATA" | jq -r '.mergeable')
6768
MERGE_STATE=$(echo "$PR_DATA" | jq -r '.mergeStateStatus')
6869
@@ -79,27 +80,30 @@ jobs:
7980
if: steps.conflict-check.outputs.has_conflict == 'true'
8081
env:
8182
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83+
GH_REPO: ${{ github.repository }}
8284
PR_NUMBER: ${{ steps.pr.outputs.number }}
8385
run: |
8486
echo "Merge conflict detected. Requesting Dependabot to rebase..."
85-
gh pr comment "$PR_NUMBER" --body "@dependabot rebase"
87+
gh pr comment "$PR_NUMBER" --repo "$GH_REPO" --body "@dependabot rebase"
8688
echo "::warning::Merge conflict detected. Requested @dependabot rebase."
8789
exit 0
8890
8991
- name: Approve Pull Request
9092
if: steps.conflict-check.outputs.has_conflict != 'true'
9193
env:
92-
PR_URL: ${{ steps.pr.outputs.url }}
9394
GH_TOKEN: ${{ secrets.CICDBOT_TOKEN }}
95+
GH_REPO: ${{ github.repository }}
96+
PR_NUMBER: ${{ steps.pr.outputs.number }}
9497
run: |
95-
echo "Approving PR: $PR_URL"
96-
gh pr review "$PR_URL" --approve --body "🤖 Auto-approved by @cicdbot after CI passed"
98+
echo "Approving PR #$PR_NUMBER"
99+
gh pr review "$PR_NUMBER" --repo "$GH_REPO" --approve --body "🤖 Auto-approved by @cicdbot after CI passed"
97100
98101
- name: Enable auto-merge
99102
if: steps.conflict-check.outputs.has_conflict != 'true'
100103
env:
101-
PR_URL: ${{ steps.pr.outputs.url }}
102-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
104+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
105+
GH_REPO: ${{ github.repository }}
106+
PR_NUMBER: ${{ steps.pr.outputs.number }}
103107
run: |
104-
echo "Enabling auto-merge for PR: $PR_URL"
105-
gh pr merge --auto --squash "$PR_URL"
108+
echo "Enabling auto-merge for PR #$PR_NUMBER"
109+
gh pr merge "$PR_NUMBER" --repo "$GH_REPO" --auto --squash

0 commit comments

Comments
 (0)