vatsrahul1001 opened a new pull request, #66927:
URL: https://github.com/apache/airflow/pull/66927

   Cherry-pick of #65223 for the Airflow 3.2.2 patch release.
   
   Backported as a prerequisite for #66311 (Breeze \`down\` discovery), which 
depends on the \`_backfill_docker\` function and \`--use-docker/--no-docker\` 
flag introduced here.
   
   ### Conflict resolution
   
   One conflict in \`.github/workflows/registry-backfill.yml\`. v3-2-test used 
a two-step "Install uv" + "Install Breeze" flow (with 
\`astral-sh/[email protected]\` pinned); upstream consolidated into the composite 
\`./.github/actions/prepare_breeze_and_image\` action. That composite action 
**does exist on v3-2-test**, so adopted the PR's consolidated step with no 
functional regression. The composite action handles uv installation internally 
with its own pinned version.
   
   All other files auto-merged cleanly. Stat matches upstream's +244/-92 
exactly.
   
   This PR replaces the closed #66910 (which had used \`git checkout --theirs\` 
wholesale and silently introduced a regression — see closed-PR discussion).
   
   ---
   
   ##### Was generative AI tooling used to co-author this PR?
   
   - [X] Yes — Claude Code (Opus 4.7)
   
   Generated-by: Claude Code (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: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to