Skip to content

[main] Upgrade important CI environment#68933

Merged
potiuk merged 5 commits into
mainfrom
ci-upgrade-main
Jun 30, 2026
Merged

[main] Upgrade important CI environment#68933
potiuk merged 5 commits 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 kind:documentation labels Jun 24, 2026
@Lee-W Lee-W mentioned this pull request Jun 26, 2026
1 task
@github-actions

Copy link
Copy Markdown
Contributor Author

uv.lock on main just moved via #68780 ("Bump zeep from 4.3.2 to 4.3.3"), commit e6c1ae6 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 Bot and others added 4 commits June 30, 2026 21:02
Regenerating the lockfile for the CI tooling bump also pulled two major
provider-library upgrades that the bump was never meant to carry: pydantic-ai
1.x to 2.x (which changed the agent instrumentation API and breaks common.ai)
and pyexasol 1.x to 2.x (whose stricter types break the exasol hook). Capping
both to 1.x keeps this PR a pure tooling upgrade; the major-version migrations
are tracked separately (#69122, #69123).

The new zizmor 1.26.1 ref-version-mismatch audit also flagged the
apache/infrastructure-actions pin, which is branch-tracked and pinned by SHA
with a "# main" comment on purpose; scope that audit off for that file.
Committed index.rst files drifted from generated/provider_dependencies.json after recent cross-provider dependency additions (e.g. common.compat). CI's prepare-provider-documentation step regenerates these, so the stale docs must be synced for it to pass.
The earlier regeneration ran through a cached uvx-built Breeze that
predated the cross-provider extras filtering, so the provider index
pages still listed required cross-provider dependencies as optional
installable extras. CI rebuilds Breeze from source and filters them
out, which made the update-providers-build-files hook keep rewriting
the pages and fail the static checks. Regenerated with `uvx --no-cache`
so the committed pages match the canonical Breeze output.
@potiuk potiuk merged commit e0a1726 into main Jun 30, 2026
294 checks passed
@potiuk potiuk deleted the ci-upgrade-main branch June 30, 2026 23:58
@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 e0a1726 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.

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 kind:documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants