Skip to content

ci(auto-approve): retry the approval on GitHub API errors #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilya-bogin-keenable merged 2 commits into from
Oct 13, 2026
Merged

ci(auto-approve): retry the approval on GitHub API errors #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085efac
ci(auto-approve): retry the approval on GitHub API errors
ilya-bogin-keenable Oct 13, 2026
886dcdb
Merge branch 'main' into ci/bridge-retry
ilya-bogin-keenable Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions .github/workflows/auto-approve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@ jobs:
NUM: ${{ github.event.issue.number }}
run: |
set -euo pipefail
# Dedupe: comment edits re-fire this job; approve each head commit once.
head_sha=$(gh api "repos/$REPO/pulls/$NUM" --jq .head.sha)
dup=$(gh api "repos/$REPO/pulls/$NUM/reviews?per_page=100" --paginate \
--jq "[.[] | select(.user.login==\"github-actions[bot]\" and .state==\"APPROVED\" and .commit_id==\"$head_sha\")] | length")
if [ "$dup" -gt 0 ]; then
echo "Head $head_sha already carries an auto-approval; nothing to do."
exit 0
fi
# Quote whatever verdict categories the comment carries, without
# encoding Qodo's taxonomy (it changes between releases). A parse
# miss must be visible, not silently degraded.
Expand All @@ -64,5 +56,31 @@ jobs:
echo "::warning::No verdict categories parsed from the Qodo comment — its format may have changed; approving with a link only."
verdict="see the review comment"
fi
gh pr review "$NUM" --repo "$REPO" --approve \
--body "Auto-approved: Qodo review completed — ${verdict}. Findings are advisory per team policy; verdict source: ${COMMENT_URL} [auto-approve.yml]"
# One attempt: dedupe, then approve. Comment edits re-fire this job,
# so each head commit is approved once.
approve_once() {
local head_sha dup
head_sha=$(gh api "repos/$REPO/pulls/$NUM" --jq .head.sha) || return 1

@qodo-code-review qodo-code-review Bot Oct 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Action required

1. Retries can approve unreviewed commits 🐞 Bug ≡ Correctness

approve_once fetches the current PR head on every attempt rather than pinning the approval to the
head from the initial attempt. If an API call fails and a new commit is pushed during a retry delay,
the next attempt can approve that new head while quoting the earlier Qodo comment's verdict and URL.
Agent Prompt 
## Issue description
A failed attempt can be retried after the PR head changes, causing an approval for a commit that was not present when the Qodo comment triggered the run.

## Fix Focus Areas
- .github/workflows/auto-approve.yml[59-71]
- .github/workflows/auto-approve.yml[73-84]

## Recommended Fix
Capture the intended head before entering the retry loop. On each attempt, abort rather than approve if the current head differs; submit the approval against the captured commit ID so a push between the check and submission cannot redirect it to a newer head.

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

Dismiss ↗ | View ↗

dup=$(gh api "repos/$REPO/pulls/$NUM/reviews?per_page=100" --paginate \
--jq "[.[] | select(.user.login==\"github-actions[bot]\" and .state==\"APPROVED\" and .commit_id==\"$head_sha\")] | length") || return 1
if [ "$dup" -gt 0 ]; then
echo "Head $head_sha already carries an auto-approval; nothing to do."
return 0
fi
gh pr review "$NUM" --repo "$REPO" --approve \
--body "Auto-approved: Qodo review completed — ${verdict}. Findings are advisory per team policy; verdict source: ${COMMENT_URL} [auto-approve.yml]" || return 1
}
# Retry: one GitHub API error (HTTP 502 during the 2026-10-12 incident)
# used to drop the approval silently. Each attempt re-reads the head and
# the dedupe, so a retry after a partial success never double-approves.
for attempt in 1 2 3 4; do
if approve_once; then
exit 0
fi
if [ "$attempt" -lt 4 ]; then
echo "::warning::Approval attempt $attempt failed (GitHub API error?); retrying in $((attempt * 20))s."
sleep $((attempt * 20))
fi
done
echo "::error::Approval failed after 4 attempts; re-run this job once GitHub recovers."
exit 1
Loading