You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "potiuk (via GitHub)" <gi...@apache.org> on 2026/04/24 09:53:41 UTC
[PR] CI: Notify open PRs that conflict on uv.lock after main merges [airflow]
potiuk opened a new pull request, #65765:
URL: https://github.com/apache/airflow/pull/65765
When \`uv.lock\` moves on \`main\`, any open PR that also touches \`uv.lock\` usually ends up with a rebase conflict. This workflow closes that feedback loop: on every push to \`main\` that modifies \`uv.lock\`, scan open non-draft PRs (updated in the last 14 days), find those currently conflicting, and post — or update in place, deduped via an HTML-comment marker — a single nudge with the exact rebase + \`uv lock\` commands.
The source PR that caused the \`uv.lock\` change is resolved from the squash-merge commit headline's trailing \`(#NNN)\` and linked in the notice; falls back to the commit URL when no match.
## Summary
- **Workflow** (\`.github/workflows/notify-uv-lock-conflicts.yml\`): path-filtered to \`uv.lock\` on \`main\`; installs \`uv\` from \`uv.lock\` (same pattern as \`scheduled-verify-release-calendar.yml\`) and runs the script.
- **Script** (\`scripts/ci/notify_uv_lock_conflicts.py\`): standalone PEP 723 (\`httpx\`, Python ≥ 3.10). One paginated GraphQL query for PR list + files + comments + mergeable, plus a retry loop (5 × 30 s) for PRs whose \`mergeable\` is still \`UNKNOWN\` after the initial 30 s settle. Writes a diagnostics table to \`GITHUB_STEP_SUMMARY\`.
- **Unit tests** (\`scripts/tests/ci/test_notify_uv_lock_conflicts.py\`): 29 tests covering the commit-regex, classifier, pagination early-exit on stale, UNKNOWN retry behaviour, and create-vs-update notice posting. Run with \`uv run --project scripts pytest scripts/tests/ci/test_notify_uv_lock_conflicts.py\`.
## Test plan
- [x] \`uv run --project scripts pytest scripts/tests/ci/test_notify_uv_lock_conflicts.py\` — 29 passed
- [x] \`uv run ruff format / check --fix\` on all three files — clean
- [x] \`prek run --from-ref upstream/main --stage pre-commit\` via commit hook — all applicable hooks passed
- [ ] First real run on \`main\` after merge — confirm the notice renders with a source-PR link and dedupe marker
---
##### Was generative AI tooling used to co-author this PR?
- [X] Yes — Claude Opus 4.7 (via Claude Code, auto mode)
Generated-by: Claude Opus 4.7 following [the guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] CI: Notify open PRs that conflict on uv.lock after main merges [airflow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #65765:
URL: https://github.com/apache/airflow/pull/65765#issuecomment-4320376877
### Backport successfully created: v3-2-test
Note: As of [Merging PRs targeted for Airflow 3.X](https://github.com/apache/airflow/blob/main/dev/README_AIRFLOW3_DEV.md#merging-prs-targeted-for-airflow-3x)
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.
In matter of doubt please ask in [#release-management](https://apache-airflow.slack.com/archives/C03G9H97MM2) Slack channel.
<table>
<tr>
<th>Status</th>
<th>Branch</th>
<th>Result</th>
</tr>
<tr>
<td>✅</td>
<td>v3-2-test</td>
<td><a href="https://github.com/apache/airflow/pull/65851"><img src="https://img.shields.io/badge/PR-65851-blue" alt="PR Link"></a></td>
</tr>
</table>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] CI: Notify open PRs that conflict on uv.lock after main merges [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #65765:
URL: https://github.com/apache/airflow/pull/65765
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org