Skip to content

[main] Upgrade important CI environment - #70501

Merged
potiuk merged 1 commit into
mainfrom
ci-upgrade-main
Aug 13, 2026
Merged

[main] Upgrade important CI environment#70501
potiuk merged 1 commit into
mainfrom
ci-upgrade-main

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This PR upgrades important dependencies of the CI environment.

@boring-cyborg boring-cyborg Bot added area:dev-tools area:production-image Production image improvements and fixes backport-to-v3-3-test Backport to v3-3-test labels Jul 27, 2026
@potiuk
potiuk marked this pull request as ready for review July 27, 2026 09:44
@potiuk
potiuk requested review from kaxil and o-nikolas as code owners July 27, 2026 16:33
@potiuk
potiuk force-pushed the ci-upgrade-main branch from 0cbebb7 to 37d48bf Compare July 27, 2026 19:05
@github-actions

github-actions Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

uv.lock on main just moved via commit fd0f7e2 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.

@github-actions
github-actions Bot marked this pull request as draft July 29, 2026 07:16
@Lee-W
Lee-W marked this pull request as ready for review July 29, 2026 07:39
@potiuk
potiuk force-pushed the ci-upgrade-main branch from db1973c to 3940902 Compare July 29, 2026 09:11
@Lee-W

Lee-W commented Jul 29, 2026

Copy link
Copy Markdown
Member

#70677 fix mypy error

@Lee-W
Lee-W force-pushed the ci-upgrade-main branch from 3940902 to b655808 Compare July 29, 2026 12:52
@Lee-W

Lee-W commented Aug 11, 2026

Copy link
Copy Markdown
Member

we kinda need #71186 (review) before merging this

@github-actions
github-actions Bot marked this pull request as draft August 12, 2026 06:38
@potiuk
potiuk marked this pull request as ready for review August 12, 2026 08:31
@potiuk

potiuk commented Aug 12, 2026

Copy link
Copy Markdown
Member

we kinda need #71186 (review) before merging this

Rebased and fixing after #71186 merged :)

@potiuk

potiuk commented Aug 12, 2026

Copy link
Copy Markdown
Member

Ah... I see you rebased just before I did (or did not effectively) @Lee-W :) .. Great minds think alike ;)

@potiuk

potiuk commented Aug 12, 2026

Copy link
Copy Markdown
Member

Need #71511 to fix it

@potiuk
potiuk merged commit 0e6ad21 into main Aug 13, 2026
491 of 503 checks passed
@potiuk
potiuk deleted the ci-upgrade-main branch August 13, 2026 14:27
@github-actions

Copy link
Copy Markdown
Contributor Author

Backport failed to create: v3-3-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-3-test Commit Link

You can attempt to backport this manually by running:

cherry_picker 0e6ad21 v3-3-test

This should apply the commit to the v3-3-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.

dabla pushed a commit to dabla/airflow that referenced this pull request Aug 14, 2026
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-tools area:production-image Production image improvements and fixes backport-to-v3-3-test Backport to v3-3-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants