Skip to content

Commit 38cd3c8

Browse files
committed
onnxsim: fix matrix so both cp311 and cp312 actually build
An include list whose entries share no key with the base matrix collapses onto a single job instead of adding one per entry (confirmed against onnxoptimizer's own CI run, which built only cp312 despite listing cp311 too). Make python a real matrix dimension so include only attaches onnxruntime to the matching combination.
1 parent 5a9dc6a commit 38cd3c8

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

‎.github/workflows/build-onnxsim.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,17 @@ jobs:
4848
fail-fast: false
4949
matrix:
5050
version: ${{ fromJSON(needs.setup.outputs.versions) }}
51-
# Upstream ships cp310/cp311/cp312-abi3 (no free-threaded wheel here: our
52-
# matrix mirrors onnxoptimizer's, which onnxsim vendors and links the
53-
# same way). cp310 is dropped: onnx (the runtime dependency) has no
54-
# riscv64 wheel for it on our registry, at any version, and no
55-
# py3-none-any fallback either (it's a compiled extension). cp311 stays:
56-
# onnx ships a riscv64 cp311 wheel, and nanobind/protobuf (the other
57-
# build-time dependencies) resolve too, via their py3-none-any fallback
58-
# wheels.
51+
# Upstream ships cp310/cp311/cp312-abi3 (no free-threaded wheel here).
52+
# cp310 is dropped: onnx (the runtime dependency) has no riscv64 wheel
53+
# for it on our registry, at any version, and no py3-none-any fallback
54+
# either (it's a compiled extension). cp311 stays: onnx ships a
55+
# riscv64 cp311 wheel, and nanobind/protobuf (the other build-time
56+
# dependencies) resolve too, via their py3-none-any fallback wheels.
57+
# `python` is a real matrix dimension (not folded into `include`
58+
# alone) so both entries actually produce a job: an `include` list
59+
# whose entries share no key with the base matrix collapses onto a
60+
# single combination instead of adding one job per entry.
61+
python: [cp311, cp312]
5962
include:
6063
- python: cp311
6164
# No riscv64 onnxruntime wheel on cp311; the rest of the suite still

0 commit comments

Comments
 (0)