Skip to content

ci: fix release pipeline race condition in PR lookup after squash merge #4

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
nilsandrey merged 5 commits into from
Mar 8, 2026
Merged

ci: fix release pipeline race condition in PR lookup after squash merge #4

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4debb91
Initial plan
Copilot Mar 8, 2026
59c563c
ci: fix release pipeline race condition with commits/pulls API
Copilot Mar 8, 2026
861cf8d
Update .github/workflows/release.yml
nilsandrey Mar 8, 2026
24eecc8
Update .github/workflows/release.yml
nilsandrey Mar 8, 2026
5e6aa84
ci: surface gh api errors instead of silently swallowing them
Copilot Mar 8, 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
37 changes: 35 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,41 @@ jobs:
run: |
# Find the PR that was merged with this push using the commits/pulls API
COMMIT_SHA="${{ github.sha }}"
PR_DATA=$(gh api "repos/${{ github.repository }}/commits/$COMMIT_SHA/pulls" \
--jq '.[0] // empty' 2>/dev/null || echo "")

# Retry up to 3 times with increasing delay to handle indexing lag
# after squash-merge commits.
GH_ERR_FILE="$RUNNER_TEMP/gh_api_err_$$"
for attempt in 1 2 3; do
API_ERR=""
PR_DATA=$(gh api "repos/${{ github.repository }}/commits/$COMMIT_SHA/pulls" \
--jq '.[0] // empty' 2>"$GH_ERR_FILE") || API_ERR=$(cat "$GH_ERR_FILE")
if [ -n "$API_ERR" ]; then
echo "::warning::Attempt $attempt: commits/pulls API error: $API_ERR"
fi
if [ -n "$PR_DATA" ]; then
Comment thread
nilsandrey marked this conversation as resolved.
echo "Found PR via commits/pulls API (attempt $attempt)."
break
fi
echo "Attempt $attempt: commits/pulls API returned no results, retrying in $((attempt * 5))s..."
if [ "$attempt" -lt 3 ]; then
sleep $((attempt * 5))
fi
done

# Fallback: extract PR number from squash-merge commit message "(#N)"
if [ -z "$PR_DATA" ]; then
echo "Commits/pulls API returned no results. Trying commit-message fallback..."
PR_NUMBER=$(git log -1 --format=%s "$COMMIT_SHA" | grep -oE '\(#[0-9]+\)' | tail -1 | tr -d '(#)')
if [ -n "$PR_NUMBER" ]; then
echo "Found PR #$PR_NUMBER from commit message."
API_ERR=""
PR_DATA=$(gh api "repos/${{ github.repository }}/pulls/$PR_NUMBER" 2>"$GH_ERR_FILE") || API_ERR=$(cat "$GH_ERR_FILE")
if [ -n "$API_ERR" ]; then
echo "::error::Failed to fetch PR #$PR_NUMBER: $API_ERR"
exit 1
fi
fi
Comment thread
nilsandrey marked this conversation as resolved.
fi

if [ -z "$PR_DATA" ]; then
echo "No merged PR found for this commit. Skipping release."
Expand Down