From c6775d1d7103132a442934e67f77e3395f37ecfb Mon Sep 17 00:00:00 2001
From: Ludovic Henry <git@ludovic.dev>
Date: Sat, 5 Sep 2026 12:38:34 +0200
Subject: [PATCH 1/2] bitstruct: add build-bitstruct.yml for riscv64 wheels

---
 .github/workflows/build-bitstruct.yml | 76 +++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 .github/workflows/build-bitstruct.yml

diff --git a/.github/workflows/build-bitstruct.yml b/.github/workflows/build-bitstruct.yml
new file mode 100644
index 000000000..848d39071
--- /dev/null
+++ b/.github/workflows/build-bitstruct.yml
@@ -0,0 +1,76 @@
+# SPDX-FileCopyrightText: 2026 The RISE Project
+# SPDX-License-Identifier: MIT
+---
+# Based on the `build_wheels` job of
+# https://github.com/eerimoq/bitstruct/blob/8.23.0/.github/workflows/release.yml
+name: Build bitstruct wheels (riscv64)
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'bitstruct version/tag to build (e.g. 8.23.0)'
+        required: true
+        default: '8.23.0'
+  pull_request:
+    paths:
+      - '.github/workflows/build-bitstruct.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ inputs.version || '8.23.0' }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read  # to fetch code (actions/checkout)
+
+env:
+  BITSTRUCT_VERSION: ${{ inputs.version || '8.23.0' }}
+  MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64
+
+jobs:
+  setup:
+    uses: $/.github/workflows/_setup.yml
+
+  build_wheels:
+    needs: [setup]
+    name: Build bitstruct ${{ inputs.version || '8.23.0' }} ${{ matrix.python }}-manylinux_riscv64
+    runs-on: ubuntu-24.04-riscv
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["cp312", "cp313", "cp314", "cp314t"]
+
+    steps:
+      - name: Checkout bitstruct ${{ env.BITSTRUCT_VERSION }}
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
+        with:
+          repository: eerimoq/bitstruct
+          ref: ${{ env.BITSTRUCT_VERSION }}
+          persist-credentials: false
+
+      - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074  # v4.2.0
+        env:
+          CIBW_ARCHS: riscv64
+          CIBW_BUILD: ${{ matrix.python }}-manylinux_riscv64
+          CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }}
+          CIBW_TEST_REQUIRES: pytest
+          CIBW_TEST_COMMAND: >-
+            python -c "import bitstruct.c as m; assert m.__file__.endswith('.so'), m.__file__" &&
+            pytest -v --assert=plain {project}/tests
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+        with:
+          name: bitstruct-${{ env.BITSTRUCT_VERSION }}-${{ matrix.python }}-manylinux_riscv64
+          path: ./wheelhouse/*.whl
+          if-no-files-found: error
+
+  publish:
+    name: Publish bitstruct ${{ inputs.version || '8.23.0' }}
+    needs: [setup, build_wheels]
+    permissions:
+      contents: write
+      pull-requests: write
+    uses: $/.github/workflows/_publish-wheel.yml
+    with:
+      artifact-pattern: bitstruct-${{ inputs.version || '8.23.0' }}-*-manylinux_riscv64

From 6213abca72f967db64ee87d117cbfd22826b108f Mon Sep 17 00:00:00 2001
From: Ludovic Henry <git@ludovic.dev>
Date: Sat, 5 Sep 2026 12:40:07 +0200
Subject: [PATCH 2/2] bitstruct: also build musllinux riscv64 wheels

bitstruct has zero runtime dependencies and its only test dependency
(pytest) is pure Python, so nothing pulls in a numpy-shaped musllinux
riscv64 blocker.
---
 .github/workflows/build-bitstruct.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-bitstruct.yml b/.github/workflows/build-bitstruct.yml
index 848d39071..a0677af2d 100644
--- a/.github/workflows/build-bitstruct.yml
+++ b/.github/workflows/build-bitstruct.yml
@@ -26,6 +26,7 @@ permissions:
 env:
   BITSTRUCT_VERSION: ${{ inputs.version || '8.23.0' }}
   MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64
+  MUSLLINUX_RISCV64_IMAGE: quay.io/pypa/musllinux_1_2_riscv64
 
 jobs:
   setup:
@@ -33,13 +34,14 @@ jobs:
 
   build_wheels:
     needs: [setup]
-    name: Build bitstruct ${{ inputs.version || '8.23.0' }} ${{ matrix.python }}-manylinux_riscv64
+    name: Build bitstruct ${{ inputs.version || '8.23.0' }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64
     runs-on: ubuntu-24.04-riscv
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         python: ["cp312", "cp313", "cp314", "cp314t"]
+        libc: [manylinux, musllinux]
 
     steps:
       - name: Checkout bitstruct ${{ env.BITSTRUCT_VERSION }}
@@ -52,8 +54,9 @@ jobs:
       - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074  # v4.2.0
         env:
           CIBW_ARCHS: riscv64
-          CIBW_BUILD: ${{ matrix.python }}-manylinux_riscv64
+          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64
           CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }}
+          CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }}
           CIBW_TEST_REQUIRES: pytest
           CIBW_TEST_COMMAND: >-
             python -c "import bitstruct.c as m; assert m.__file__.endswith('.so'), m.__file__" &&
@@ -61,7 +64,7 @@ jobs:
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
         with:
-          name: bitstruct-${{ env.BITSTRUCT_VERSION }}-${{ matrix.python }}-manylinux_riscv64
+          name: bitstruct-${{ env.BITSTRUCT_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64
           path: ./wheelhouse/*.whl
           if-no-files-found: error
 
@@ -73,4 +76,4 @@ jobs:
       pull-requests: write
     uses: $/.github/workflows/_publish-wheel.yml
     with:
-      artifact-pattern: bitstruct-${{ inputs.version || '8.23.0' }}-*-manylinux_riscv64
+      artifact-pattern: bitstruct-${{ inputs.version || '8.23.0' }}-*riscv64