Skip to content

ci: migrate 6 workflows (with per-leg overrides) to needs.setup.outputs.matrix (extra-include batch 3/4) - #4923

Open
luhenry wants to merge 1 commit into
mainfrom
fix/matrix-extra-3
Open

luhenry wants to merge 1 commit into
mainfrom
fix/matrix-extra-3

Conversation

@luhenry

@luhenry luhenry commented Nov 18, 2026 •

Copy link
Copy Markdown
Member

Same bug class as #4914/#4915, for 6 workflows that layer a second override axis (an extra include: block) on top of the hardcoded python:/libc: lists. Each now uses matrix.include: ${{ fromJSON(needs.setup.outputs.matrix) }} and inlines its override as a ternary at the point of use.

libdatachannel-py: dropped the python:/include: pair entirely - python-version already comes straight off needs.setup.outputs.matrix, no override left to convert. Mismatch: the hardcoded list stopped at cp314t; the real matrix also builds cp315/cp315t, which the YAML already declares.

lz4: pytest_addopts/tox_free_threading (cp314t-only) become ${{ matrix.python == 'cp314t' && '...' || '' }} at CIBW_ENVIRONMENT and CIBW_TEST_COMMAND. Mismatch: the hardcoded list never built cp310/cp311 though the YAML declares them (still pending); it did build cp314t, which the YAML never declared (it lists 3.13t, and there's no riscv64 cp313t). The real matrix now builds cp310/cp311/cp312/cp313/cp314 and correctly drops cp314t.

moviepilot-rust: the per-python environment override (cp314/cp314t) becomes a chained ternary on matrix.python at CIBW_ENVIRONMENT_LINUX. This file already used matrix.platform (not libc), so no rename needed. Clean conversion - the generated matrix reproduces the same 4 legs (cp314/cp314t x manylinux/musllinux) exactly.

onnxsim: cp311's onnxruntime/pytest_k overrides become ternaries on matrix.python at CIBW_TEST_REQUIRES/CIBW_TEST_COMMAND. Added python-exclude: 'cp39 cp310' to setup's with: to keep the documented cp310 drop (no riscv64 onnx wheel). Mismatch: the hardcoded list only ever built cp311/cp312, but the YAML declares 3.14t too (upstream does ship it); the real matrix now also builds cp314t, which falls through to the cp312-style (fuller) test selection since there's no override data for it.

pgserver: cp314t's test_skip becomes ${{ matrix.python == 'cp314t' && '*' || '' }} at CIBW_TEST_SKIP. Mismatch: the hardcoded list built cp312/cp313/cp314/cp314t, but the only pending version (0.1.4) declares just 3.9-3.12; the real matrix instead builds cp310/cp311/cp312 (cp313/cp314/cp314t drop out, cp310/cp311 newly appear).

picows: libc renamed to platform throughout (job name, only:, CIBW_TEST_REQUIRES, artifact name); musllinux's test_skip becomes ${{ matrix.platform == 'musllinux' && '*' || '' }}. The declared targets are a full cp39-cp314t x manylinux/musllinux cross, same as the old hardcoded matrix, except cp39 now drops out under the repo-wide default python-exclude: 'cp39' (same as every other migrated workflow).

Verified each against the old hardcoded combinations with uv run ci_scripts/pending_versions.py --python-matrix --python-exclude <exclude> <pkg>; the mismatches above are the stale-matrix bug this migration structurally fixes, not something this PR is patching around.

No functional changes beyond the matrix source and the listed python-exclude addition.

…ts.matrix

Convert build-libdatachannel-py.yml, build-lz4.yml, build-moviepilot-rust.yml,
build-onnxsim.yml, build-pgserver.yml and build-picows.yml from hardcoded
python/libc matrix arrays plus an extra include: override block to
matrix.include: ${{ fromJSON(needs.setup.outputs.matrix) }}, inlining each
override as a ternary expression at its point of use:

- libdatachannel-py: python-version now comes straight from the matrix; no
  override left to convert.
- lz4: cp314t's pytest_addopts/tox_free_threading become inline ternaries on
  matrix.python.
- moviepilot-rust: per-python environment override becomes a chained ternary
  on matrix.python; it already used matrix.platform, so no libc rename needed.
- onnxsim: cp311's onnxruntime/pytest_k overrides become inline ternaries on
  matrix.python; added python-exclude: 'cp39 cp310' to setup to keep the
  documented cp310 drop (no riscv64 onnx wheel).
- pgserver: cp314t's test_skip becomes an inline ternary on matrix.python.
- picows: libc renamed to platform throughout (job name, only:, test
  requires, artifact name); musllinux's test_skip becomes an inline ternary
  on matrix.platform.

Verified each with ci_scripts/pending_versions.py --python-matrix against the
old hardcoded lists; see PR description for the mismatches found.

This branch has not been deployed

No deployments
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