Skip to content

[main] Upgrade important CI environment#66631

Merged
potiuk merged 1 commit intoapache:mainfrom
jscheffl:ci-upgrade-main
May 10, 2026
Merged

[main] Upgrade important CI environment#66631
potiuk merged 1 commit intoapache:mainfrom
jscheffl:ci-upgrade-main

Conversation

@jscheffl
Copy link
Copy Markdown
Contributor

@jscheffl jscheffl commented May 9, 2026

This PR upgrades important dependencies of the CI environment.

@boring-cyborg boring-cyborg Bot added area:dev-tools area:kubernetes-tests area:production-image Production image improvements and fixes area:providers backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch provider:cncf-kubernetes Kubernetes (k8s) provider related issues labels May 9, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 9, 2026

uv.lock on main just moved via #66600 ("[main] CI: Upgrade important CI environment"), commit 8a55076 and this PR currently conflicts.

Quickest fix:

git fetch upstream main && git rebase upstream/main
rm uv.lock && uv lock
git add uv.lock && git rebase --continue
git push --force-with-lease

Automated nudge — ignore if you're not ready to rebase. This comment is updated in place on future uv.lock bumps.

@jscheffl jscheffl force-pushed the ci-upgrade-main branch from 9881a74 to 4aae05f Compare May 9, 2026 20:07
@potiuk potiuk merged commit 1aff9b6 into apache:main May 10, 2026
291 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
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 Slack channel.

Status Branch Result
v3-2-test Commit Link

You can attempt to backport this manually by running:

cherry_picker 1aff9b6 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

@jscheffl
Copy link
Copy Markdown
Contributor Author

Repeating same in #66654

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-tools area:kubernetes-tests area:production-image Production image improvements and fixes area:providers backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch provider:cncf-kubernetes Kubernetes (k8s) provider related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants