From 3d7fc330b9ce852a75fb929f2afe97bd28719201 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 25 Sep 2026 12:07:58 +0000 Subject: [PATCH 1/2] pyvex: Add version 9.3.3 --- .github/workflows/build-pyvex.yml | 97 +++++++++++++++++++++++++++++++ docs/packages/pyvex.yaml | 5 ++ 2 files changed, 102 insertions(+) create mode 100644 .github/workflows/build-pyvex.yml create mode 100644 docs/packages/pyvex.yaml diff --git a/.github/workflows/build-pyvex.yml b/.github/workflows/build-pyvex.yml new file mode 100644 index 00000000000..0e668589566 --- /dev/null +++ b/.github/workflows/build-pyvex.yml @@ -0,0 +1,97 @@ +# SPDX-FileCopyrightText: 2026 The RISE Project +# SPDX-License-Identifier: MIT +--- +# This workflow is based on: https://github.com/angr/ci-settings/blob/0b2428c46c155584d3029761adcd9b6138ab85d0/.github/workflows/angr-release.yml +name: Build pyvex wheels (riscv64) + +on: + workflow_dispatch: + inputs: + version: + description: 'Version glob to (re)build; empty builds every version of docs/packages/pyvex.yaml not released yet' + required: false + default: '' + pull_request: + branches: [main] + paths: + - '.github/workflows/build-pyvex.yml' + - 'docs/packages/pyvex.yaml' + push: + branches: [main] + paths: + - '.github/workflows/build-pyvex.yml' + - 'docs/packages/pyvex.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: pyvex + version: ${{ inputs.version }} + + build_wheels: + needs: [setup] + if: needs.setup.outputs.versions != '[]' + strategy: + fail-fast: false + matrix: + version: ${{ fromJSON(needs.setup.outputs.versions) }} + name: Build pyvex ${{ matrix.version }} cp312-abi3-manylinux_riscv64 + runs-on: ubuntu-24.04-riscv + timeout-minutes: 60 + env: + PYVEX_VERSION: ${{ matrix.version }} + + steps: + - name: Checkout pyvex ${{ env.PYVEX_VERSION }} + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: angr/pyvex + ref: v${{ env.PYVEX_VERSION }} + submodules: recursive + persist-credentials: false + + - name: Build and test wheel + uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 + env: + CIBW_ARCHS: riscv64 + CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} + CIBW_BUILD: "cp312-* cp313-* cp314-*" + CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair --exclude libpyvex.so -w {dest_dir} {wheel}" + CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ + CIBW_TEST_ENVIRONMENT: "PIP_ONLY_BINARY=:all:" + CIBW_TEST_GROUPS: dev + CIBW_TEST_COMMAND: pytest {project}/tests + + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: pyvex-${{ env.PYVEX_VERSION }}-cp312-abi3-manylinux_riscv64 + path: ./wheelhouse/*.whl + if-no-files-found: error + + publish: + name: Publish pyvex ${{ 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: pyvex-${{ matrix.version }}-*-manylinux_riscv64 diff --git a/docs/packages/pyvex.yaml b/docs/packages/pyvex.yaml new file mode 100644 index 00000000000..effb7c08b10 --- /dev/null +++ b/docs/packages/pyvex.yaml @@ -0,0 +1,5 @@ +package-name: pyvex +source-code: https://github.com/angr/pyvex +license: BSD-2-Clause AND GPL-2.0-only +versions: +- version: 9.3.3 From 79b27dbdc6dae83cb649bc03e45259a33c1895dc Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 25 Sep 2026 17:48:17 +0000 Subject: [PATCH 2/2] pyvex: Build musllinux in its own job with a scoped test only-binary cffi and bitarray have no musllinux riscv64 wheel on PyPI or our registry, so PIP_ONLY_BINARY=:all: made the musllinux test install fail. Split the job per libc and, on musllinux, restrict only-binary to tibs so cffi and bitarray build from sdist while bitstring still resolves to 4.3.1 as on manylinux. --- .github/workflows/build-pyvex.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-pyvex.yml b/.github/workflows/build-pyvex.yml index 0e668589566..7d4747b7ec1 100644 --- a/.github/workflows/build-pyvex.yml +++ b/.github/workflows/build-pyvex.yml @@ -31,6 +31,7 @@ permissions: env: MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64 + MUSLLINUX_RISCV64_IMAGE: quay.io/pypa/musllinux_1_2_riscv64 jobs: setup: @@ -46,7 +47,8 @@ jobs: fail-fast: false matrix: version: ${{ fromJSON(needs.setup.outputs.versions) }} - name: Build pyvex ${{ matrix.version }} cp312-abi3-manylinux_riscv64 + libc: [manylinux, musllinux] + name: Build pyvex ${{ matrix.version }} cp312-abi3-${{ matrix.libc }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 env: @@ -66,16 +68,20 @@ jobs: env: CIBW_ARCHS: riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} - CIBW_BUILD: "cp312-* cp313-* cp314-*" + CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} + CIBW_BUILD: cp312-${{ matrix.libc }}_riscv64 cp313-${{ matrix.libc }}_riscv64 cp314-${{ matrix.libc }}_riscv64 CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair --exclude libpyvex.so -w {dest_dir} {wheel}" CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ - CIBW_TEST_ENVIRONMENT: "PIP_ONLY_BINARY=:all:" + # cffi and bitarray have riscv64 wheels on our registry for manylinux + # only, so musllinux builds them from sdist; tibs stays binary-only so + # bitstring resolves to the same 4.3.1 on both legs. + CIBW_TEST_ENVIRONMENT: ${{ matrix.libc == 'manylinux' && 'PIP_ONLY_BINARY=:all:' || 'PIP_ONLY_BINARY=tibs' }} CIBW_TEST_GROUPS: dev CIBW_TEST_COMMAND: pytest {project}/tests - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: pyvex-${{ env.PYVEX_VERSION }}-cp312-abi3-manylinux_riscv64 + name: pyvex-${{ env.PYVEX_VERSION }}-cp312-abi3-${{ matrix.libc }}_riscv64 path: ./wheelhouse/*.whl if-no-files-found: error @@ -94,4 +100,4 @@ jobs: secrets: app-private-key: ${{ secrets.RISEPROJECT_APP_PRIVATE_KEY }} with: - artifact-pattern: pyvex-${{ matrix.version }}-*-manylinux_riscv64 + artifact-pattern: pyvex-${{ matrix.version }}-*riscv64