From 0a64ed9cc532ebf058309e12c69d966cf283f73c Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 21 Sep 2026 03:54:40 +0000 Subject: [PATCH 1/2] cmsis-pack-manager: Add version 0.6.0 Builds the Rust core that parses CMSIS-Pack index and PDSC metadata for riscv64, the way upstream's own ci-build-wheel.yml does: maturin with cffi bindings, so the wheel carries libcmsis_pack_manager.so and cffi's ABI mode dlopens it at import. Upstream publishes no riscv64 wheel. The missing ABI tag is honest rather than a hand-set platform tag - nothing is imported as an extension module - so one py3-none-manylinux_riscv64 wheel serves every interpreter, and the further cibuildwheel identifiers only re-run the test suite under each one. Nothing in the 133-crate graph is architecture-specific, and the only piece of upstream's before-all that riscv64 needs is rustup: reqwest reaches TLS through rustls rather than openssl, and the manylinux image already ships libffi-devel and libatomic. rustup has a riscv64 host toolchain for the 1.71.1 that the repository's rust-toolchain file pins, which is what upstream's wheel job installs too. --- .../workflows/build-cmsis-pack-manager.yml | 119 ++++++++++++++++++ docs/packages/cmsis-pack-manager.yaml | 5 + 2 files changed, 124 insertions(+) create mode 100644 .github/workflows/build-cmsis-pack-manager.yml create mode 100644 docs/packages/cmsis-pack-manager.yaml diff --git a/.github/workflows/build-cmsis-pack-manager.yml b/.github/workflows/build-cmsis-pack-manager.yml new file mode 100644 index 0000000000..3c7c5f5958 --- /dev/null +++ b/.github/workflows/build-cmsis-pack-manager.yml @@ -0,0 +1,119 @@ +# SPDX-FileCopyrightText: 2026 The RISE Project +# SPDX-License-Identifier: MIT +--- +# Based on upstream's own wheel build at this tag: +# https://github.com/pyocd/cmsis-pack-manager/blob/v0.6.0/.github/workflows/ci-build-wheel.yml +name: Build cmsis-pack-manager wheels (riscv64) + +on: + workflow_dispatch: + inputs: + version: + description: 'Version glob to (re)build; empty builds every version of docs/packages/cmsis-pack-manager.yaml not released yet' + required: false + default: '' + pull_request: + branches: [main] + paths: + - '.github/workflows/build-cmsis-pack-manager.yml' + - 'docs/packages/cmsis-pack-manager.yaml' + push: + branches: [main] + paths: + - '.github/workflows/build-cmsis-pack-manager.yml' + - 'docs/packages/cmsis-pack-manager.yaml' + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: + contents: read # to fetch code (actions/checkout) + +env: + MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64 + +jobs: + setup: + uses: $/.github/workflows/_setup.yml + with: + package: cmsis-pack-manager + version: ${{ inputs.version }} + + build_wheels: + needs: [setup] + if: needs.setup.outputs.versions != '[]' + name: Build cmsis-pack-manager ${{ matrix.version }} py3-none-manylinux_riscv64 + runs-on: ubuntu-24.04-riscv + timeout-minutes: 180 + strategy: + fail-fast: false + matrix: + version: ${{ fromJSON(needs.setup.outputs.versions) }} + + env: + CMSIS_PACK_MANAGER_VERSION: ${{ matrix.version }} + + steps: + - name: Checkout cmsis-pack-manager ${{ env.CMSIS_PACK_MANAGER_VERSION }} + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: pyocd/cmsis-pack-manager + ref: v${{ env.CMSIS_PACK_MANAGER_VERSION }} + persist-credentials: false + + - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 + with: + output-dir: wheelhouse/ + env: + # maturin's cffi bindings reach the Rust cdylib through cffi's ABI mode, so + # the wheel is py3-none: one build serves every interpreter, and the further + # identifiers only re-run the test command against it. + CIBW_BUILD: cp312-manylinux_riscv64 cp313-manylinux_riscv64 cp314-manylinux_riscv64 cp314t-manylinux_riscv64 + CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} + # Upstream also installs libffi-devel, libatomic and openssl-devel here; the + # first two the image already ships, and the crate graph uses rustls. + CIBW_BEFORE_ALL_LINUX: > + curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.71.1 --profile=minimal -y + CIBW_ENVIRONMENT: >- + PATH="$PATH:$HOME/.cargo/bin" + PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ + CIBW_TEST_SOURCES: tests pyproject.toml + CIBW_TEST_EXTRAS: test + CIBW_TEST_COMMAND: pytest --cache-clear + + - name: Check the wheel carries the Rust cdylib + run: | + python3 - wheelhouse/*.whl <<'EOF' + import sys, zipfile + + for whl in sys.argv[1:]: + names = zipfile.ZipFile(whl).namelist() + assert any( + n.endswith("cmsis_pack_manager/libcmsis_pack_manager.so") for n in names + ), names + print(whl, "ok") + EOF + + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: cmsis-pack-manager-${{ env.CMSIS_PACK_MANAGER_VERSION }}-py3-none-manylinux_riscv64 + path: wheelhouse/*.whl + if-no-files-found: error + + publish: + name: Publish cmsis-pack-manager ${{ matrix.version }} + needs: [setup, build_wheels] + if: needs.setup.outputs.versions != '[]' + strategy: + fail-fast: false + matrix: + version: ${{ fromJSON(needs.setup.outputs.versions) }} + permissions: + contents: write + pull-requests: write + uses: $/.github/workflows/_publish-wheel.yml + secrets: + app-private-key: ${{ secrets.RISEPROJECT_APP_PRIVATE_KEY }} + with: + artifact-pattern: cmsis-pack-manager-${{ matrix.version }}-py3-none-manylinux_riscv64 diff --git a/docs/packages/cmsis-pack-manager.yaml b/docs/packages/cmsis-pack-manager.yaml new file mode 100644 index 0000000000..4bc09e12b4 --- /dev/null +++ b/docs/packages/cmsis-pack-manager.yaml @@ -0,0 +1,5 @@ +package-name: cmsis-pack-manager +source-code: https://github.com/pyocd/cmsis-pack-manager +license: Apache-2.0 +versions: +- version: 0.6.0 From 5baae9223dc844b4b7a4d431b198266d881c0e90 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 21 Sep 2026 04:57:27 +0000 Subject: [PATCH 2/2] cmsis-pack-manager: keep the free-threaded leg on a hypothesis wheel pip resolves a test dependency by version, not by whether a riscv64 wheel exists for the interpreter under test, so the cp314t leg reached for hypothesis 6.168.0's sdist: that release publishes cp310-abi3 riscv64 wheels, which the three GIL-ful legs install happily and a free-threaded interpreter cannot load at all. The source build then died in cargo - the toolchain this port installs is upstream's 1.71.1, and hypothesis ships a version 4 Cargo.lock. PIP_ONLY_BINARY=hypothesis, scoped to the test phase, stops pip at the newest release that actually has a wheel for each interpreter - 6.165.10 from pypi.riseproject.dev covers cp314t - instead of hand-pinning a version that goes stale as the registry builds newer ones. Checked in the manylinux_2_39_riscv64 image on the free-threaded interpreter: hypothesis 6.165.10 installs and all 11 tests pass. --- .github/workflows/build-cmsis-pack-manager.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-cmsis-pack-manager.yml b/.github/workflows/build-cmsis-pack-manager.yml index 3c7c5f5958..a9abbd4e1c 100644 --- a/.github/workflows/build-cmsis-pack-manager.yml +++ b/.github/workflows/build-cmsis-pack-manager.yml @@ -80,6 +80,9 @@ jobs: PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ CIBW_TEST_SOURCES: tests pyproject.toml CIBW_TEST_EXTRAS: test + # hypothesis' newest release has no free-threaded riscv64 wheel, and pip + # resolves by version, not by what has one; ours is a release older. + CIBW_TEST_ENVIRONMENT: PIP_ONLY_BINARY=hypothesis CIBW_TEST_COMMAND: pytest --cache-clear - name: Check the wheel carries the Rust cdylib