Skip to content

Label integration PRs when snapshot auto-recovery updates files #605

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

Closed
Copilot wants to merge 6 commits into from
Closed

Label integration PRs when snapshot auto-recovery updates files #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5394c32
Initial plan
Copilot Apr 20, 2026
e43bccf
integration-batch: label integration PR when snapshots were auto-updated
Copilot Apr 20, 2026
3d2fed8
integration-batch: robustly resolve integration PR number before labe…
Copilot Apr 20, 2026
d32e944
integration-batch: parse created PR URL for reliable label targeting
Copilot Apr 20, 2026
b892ce5
integration-batch: retry integration PR lookup after create
Copilot Apr 20, 2026
828bdf0
integration-batch: improve integration PR lookup retry diagnostics
Copilot Apr 20, 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
18 changes: 18 additions & 0 deletions .github/workflows/integration-batch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,26 @@ jobs:
existing="$(gh pr list --repo "$REPO" --state open --head integration --base main --json number --jq '.[0].number // empty')"
if [ -n "$existing" ]; then
gh pr edit "$existing" --repo "$REPO" --title "integration" --body "$body"
integration_pr_number="$existing"
else
gh pr create --repo "$REPO" --head integration --base main --title "integration" --body "$body"
integration_pr_number=""
max_attempts=5
for _ in $(seq 1 "$max_attempts"); do
integration_pr_number="$(gh pr list --repo "$REPO" --state open --head integration --base main --json number --jq '.[0].number // empty')"
if [[ "$integration_pr_number" =~ ^[0-9]+$ ]]; then
break
fi
sleep 2
done
if ! [[ "$integration_pr_number" =~ ^[0-9]+$ ]]; then
echo "Unable to resolve integration PR number after $max_attempts retry attempts" >&2
exit 1
fi
fi

if echo "$snapshot_updates" | jq -e '.files | length > 0' >/dev/null; then
gh pr edit "$integration_pr_number" --repo "$REPO" --add-label integration-needs-snapshot-review
fi

- name: Job summary
Expand Down
1 change: 1 addition & 0 deletions docs/INTEGRATION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The [`integration-batch` workflow](../.github/workflows/integration-batch.yml) a
- `integration-batch`: PR is queued for integration batching.
- `integrated`: PR was successfully merged into the `integration` branch by automation.
- `integration-failed`: automation attempted integration but hit a merge conflict.
- `integration-needs-snapshot-review`: generated `integration -> main` PR where snapshot auto-recovery updated snapshot files.

## Selection rules

Expand Down