Repository navigation
Conversation
build-rs1090.yml, build-sudachipy.yml, build-theine-core.yml and
build-wolfxl.yml still hard-coded their build_wheels interpreter/platform
matrix instead of sourcing it from the setup job's generated matrix.
- theine-core: straight swap, matrix.python/matrix.platform already named
the way the generated matrix does.
- sudachipy: straight swap; the hard-coded cp310/cp314t pair assumed the
0.7.0 abi3 shape, but the actually-pending version (0.6.11) has no abi3
target and needs one wheel per interpreter instead. The per-interpreter
CIBW_TEST_REQUIRES/CIBW_TEST_COMMAND overrides for cp314t move from a
matrix `include:` key (not representable once include: is the sole,
generated matrix key) to inline matrix.python == 'cp314t' expressions.
- rs1090 and wolfxl: swap plus a new matrix-filtering job, because
docs/packages/{rs1090,wolfxl}.yaml also declare musllinux targets that
these jobs cannot actually build+test: their test steps need pandas
(rs1090) / Pillow (wolfxl), and pypi.riseproject.dev has no
musllinux_riscv64 wheel for either (checked against the Simple API).
Passing needs.setup.outputs.matrix straight through to `publish` would
make its completeness check demand those untested wheels, so a small
ubuntu-latest job filters the generated matrix down to manylinux rows
before both build_wheels and publish consume it.
Verified each new matrix against `pending_versions.py --python-matrix
<pkg>` for the currently pending version of all four packages.
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of the repo-wide migration off hard-coded
build_wheelsmatrices ontoneeds.setup.outputs.matrix. This batch covers the 4 remaining maturin/PyO3 workflows.Packages touched
theine-core — straight swap.
matrix.python/matrix.platformare already the field names the generated matrix uses (theDetermine target interpreterstep, theIMAGE/target/manylinuxplatform branching, and the docker-based musllinux test all already key off those exact names), so only thestrategy.matrixblock changes:version/python/platformarrays →include: ${{ fromJSON(needs.setup.outputs.matrix) }}.sudachipy — straight swap, same mapping. The hard-coded
python: ["cp310", "cp314t"]plus itsinclude:block assumed the 0.7.0 abi3-py310 shape (one cp310 wheel covering every non-free-threaded interpreter + a separate cp314t). But the version actually pending right now (pending_versions.py sudachipy→0.6.11) declares no abi3 target at all, so it needs one plain wheel per interpreter (cp310, cp311, cp312, cp313, cp314, cp314t). The generated matrix handles both shapes correctly per version (it collapses abi3 targets automatically), so this is a real fix, not just a sourcing change — the old hard-coded workflow would have built only 2 of the 6 wheels this pending version needs. The per-interpreterdrop_pretokenizer_test/test_requiresoverrides for cp314t, previously carried as extrainclude:keys, became inlinematrix.python == 'cp314t' && ... || ...expressions inCIBW_TEST_REQUIRES/CIBW_TEST_COMMAND(a generatedinclude:-only matrix can't carry extra per-entry keys).rs1090 and wolfxl — swap plus one new job. Both packages'
docs/packages/*.yamldeclare musllinux targets, but:pending_versions.py --python-matrixconfirms the generated matrix includes musllinux rows for the currently pending version of each (rs1090 0.7.0, wolfxl 2.0.36).pandas, wolfxl's needsPillow— checkedpypi.riseproject.dev's Simple API directly, and neither has anymusllinux_riscv64wheel there (manylinux only). Building a musllinux wheel with nothing to test it with isn't something I was confident forcing through blind, so those rows are dropped rather than attempted (matches this repo's own documented "dropping musllinux is an accepted outcome" policy).needs.setup.outputs.matrixstraight topublishwould have madeupdate_doc.py's completeness check demand a musllinux wheel that build_wheels never uploads (release is incomplete; no wheel was built for: ...) — this isn't hypothetical, it already happens today in both files' unconverted form, once a push-triggered publish runs for the currently pending version, sincepublishalready consumesneeds.setup.outputs.matrixdirectly. So each file gets a small newmanylinux_matrixjob (runs-on: ubuntu-latest) that filters the setup job's matrix down toplatform == 'manylinux'rows; bothbuild_wheelsandpublishnow consume that filtered output instead ofneeds.setup.outputs.matrixdirectly.matrix.python(cp-tag) drives aDetermine target interpreterstep (already present in wolfxl, added to rs1090, replacing its old staticpython → interpreter/python-versioninclude:table) producing apythonX.Y[t]string used for maturin's-iflag andsetup-uv'spython-versioninput.test_deselectoverride for cp314t became an inlinematrix.python == 'cp314t' && ... || ''expression, same reasoning as sudachipy.Verification
Ran
uv run --quiet ci_scripts/pending_versions.py --python-matrix <pkg>(and with--python-exclude cp39to match_setup.yml's default) for all four packages' realpackage-name:and compared against what each old hard-coded matrix built:Not done
musllinux for rs1090/wolfxl is deliberately left unbuilt (see above) — a real follow-up would need to either get musllinux_riscv64 wheels for pandas/Pillow onto the registry, or edit
docs/packages/{rs1090,wolfxl}.yamlto stop declaring those targets (both out of scope for this PR, which only touches.github/workflows/*).