Skip to content

馃懛 ci: derive the wheel toolchain from rust-toolchain.toml - #689

Merged
gaborbernat merged 2 commits into
tox-dev:mainfrom
gaborbernat:rust-toolchain-single-source
Aug 23, 2026
Merged

馃懛 ci: derive the wheel toolchain from rust-toolchain.toml#689
gaborbernat merged 2 commits into
tox-dev:mainfrom
gaborbernat:rust-toolchain-single-source

Conversation

@gaborbernat

Copy link
Copy Markdown
Member

The wheel build pins the Rust channel and components in CIBW_BEFORE_ALL_LINUX, and rust-toolchain.toml states them again; the comment above the pin asks whoever edits one to keep the other in sync. Dependabot owns the toml file and cannot reach the workflow, so #686 moved the channel to 1.98 while the pin stayed at 1.97. Each container then provisioned 1.98 on demand during the parallel ninja build, raced, and the aarch64 musl wheel died with recovering from a partially installed toolchain then detected conflict: 'bin/cargo-clippy'. 馃懛

A step now reads rust-toolchain.toml and hands rustup the flags, so the two cannot disagree and the next toolchain bump needs no workflow edit. Running the step as GitHub composes it emits flags=--default-toolchain 1.97 --component clippy --component llvm-tools-preview --component rustfmt.

The channel and components were written twice, and the comment asked whoever
edited one to remember the other. Dependabot owns rust-toolchain.toml and cannot
reach the workflow, so its bump to 1.98 left the pin at 1.97; the container then
provisioned 1.98 on demand during the parallel build and the aarch64 musl wheel
failed on a half-installed toolchain.

Reading the file at build time removes the pair that can disagree.
The Windows wheel jobs run steps through PowerShell, which rejects the heredoc.
Resolve the version already names bash for the same reason.
@gaborbernat
gaborbernat force-pushed the rust-toolchain-single-source branch from bb08cbb to 546326a Compare August 23, 2026 19:52
@gaborbernat
gaborbernat enabled auto-merge (squash) August 23, 2026 19:52
@gaborbernat
gaborbernat merged commit 67aea4d into tox-dev:main Aug 23, 2026
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant