Skip to content

Commit 2ba37f2

Browse files
committed
Normalize dependabot auto-merge workflow
1 parent 99c0d8b commit 2ba37f2

2 files changed

Lines changed: 23 additions & 1 deletion

File tree

.github/workflows/dependabot-auto-merge.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ jobs:
7070
GH_REPO: ${{ github.repository }}
7171
PR_NUMBER: ${{ steps.pr.outputs.number }}
7272
run: |
73-
if gh pr checks "$PR_NUMBER" --required; then
73+
if checks_output="$(gh pr checks "$PR_NUMBER" --required 2>&1)"; then
74+
echo "passed=true" >> "$GITHUB_OUTPUT"
75+
elif echo "$checks_output" | grep -q "no required checks reported"; then
76+
echo "No required checks configured for this PR; treating as pass for automerge gating."
7477
echo "passed=true" >> "$GITHUB_OUTPUT"
7578
else
7679
echo "passed=false" >> "$GITHUB_OUTPUT"
@@ -90,6 +93,24 @@ jobs:
9093
echo "touches_workflows=false" >> "$GITHUB_OUTPUT"
9194
fi
9295
96+
- name: Debug automerge prerequisites
97+
if: steps.pr.outputs.eligible == 'true'
98+
env:
99+
GH_TOKEN: ${{ secrets.AUTOMERGE_GH_TOKEN != '' && secrets.AUTOMERGE_GH_TOKEN || secrets.GITHUB_TOKEN }}
100+
PR_NUMBER: ${{ steps.pr.outputs.number }}
101+
REPO: ${{ github.repository }}
102+
run: |
103+
echo "actor=${GITHUB_ACTOR}"
104+
echo "event=${GITHUB_EVENT_NAME}"
105+
echo "pr_eligible=${{ steps.pr.outputs.eligible }}"
106+
echo "pr_number=${PR_NUMBER}"
107+
echo "checks_passed=${{ steps.checks.outputs.passed }}"
108+
echo "touches_workflows=${{ steps.changed-files.outputs.touches_workflows || 'unknown' }}"
109+
gh auth status || true
110+
gh pr view "$PR_NUMBER" --repo "$REPO" \
111+
--json number,author,isDraft,mergeStateStatus,maintainerCanModify,state,autoMergeRequest \
112+
--jq '{number, author: .author.login, isDraft, mergeStateStatus, maintainerCanModify, state, autoMerge: .autoMergeRequest != null}'
113+
93114
- name: Require dedicated token for workflow changes
94115
if: >
95116
steps.pr.outputs.eligible == 'true' &&

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/target
2+
/.codex
23
*.epub
34
*.pdf
45

0 commit comments

Comments
 (0)