From 5b77e4d6e37bd5d4394b7499137b245c56218f7d Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 11 Sep 2026 09:55:23 +0200 Subject: [PATCH 1/2] moderngl: add build-moderngl.yml for riscv64 wheels --- .github/workflows/build-moderngl.yml | 98 ++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 .github/workflows/build-moderngl.yml diff --git a/.github/workflows/build-moderngl.yml b/.github/workflows/build-moderngl.yml new file mode 100644 index 0000000000..d195d2824c --- /dev/null +++ b/.github/workflows/build-moderngl.yml @@ -0,0 +1,98 @@ +# SPDX-FileCopyrightText: 2026 The RISE Project +# SPDX-License-Identifier: MIT +--- +# This workflow is based on: https://github.com/moderngl/moderngl/blob/5.12.0/.github/workflows/release.yml +name: Build moderngl wheels (riscv64) + +on: + workflow_dispatch: + inputs: + version: + description: 'moderngl version to build (git tag, e.g. 5.12.0)' + required: true + default: '5.12.0' + pull_request: + paths: + - '.github/workflows/build-moderngl.yml' + +concurrency: + group: ${{ github.workflow }}-${{ inputs.version || '5.12.0' }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: + contents: read # to fetch code (actions/checkout) + +env: + # `inputs.version` is empty on pull_request events; default to 5.12.0 there. + MODERNGL_VERSION: ${{ inputs.version || '5.12.0' }} + MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64 + MUSLLINUX_RISCV64_IMAGE: quay.io/pypa/musllinux_1_2_riscv64 + +jobs: + setup: + uses: $/.github/workflows/_setup.yml + + build_wheels: + needs: [setup] + name: Build moderngl ${{ inputs.version || '5.12.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 moderngl ${{ env.MODERNGL_VERSION }} + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: moderngl/moderngl + ref: ${{ env.MODERNGL_VERSION }} + persist-credentials: false + + - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 + with: + output-dir: wheelhouse/ + only: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + env: + CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} + CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} + CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ LIBGL_ALWAYS_SOFTWARE=1 + # Upstream's own pytest suite (tests/, via a standalone EGL context - + # see tests/conftest.py) needs numpy/scipy/PyOpenGL, and it is the real + # test of the compiled extension - moderngl.mgl has zero build-time + # native deps (src/moderngl.cpp only calls GL through function pointers + # loaded by glcontext, our own riscv64 registry package), so nothing + # else exercises it. numpy/scipy have no musllinux riscv64 wheel on + # either PyPI or our registry (same gap as gotcha 253's kind), so + # musllinux gets the lighter EGL-context smoke test glcontext's own + # port already validated instead of the full suite. + CIBW_TEST_REQUIRES: ${{ matrix.libc == 'manylinux' && 'pytest numpy scipy PyOpenGL' || '' }} + CIBW_TEST_COMMAND: ${{ matrix.libc == 'manylinux' && 'python -m pytest {project}/tests -v' || 'python3 -c "import moderngl; ctx = moderngl.create_context(standalone=True); print(ctx.info); ctx.release()"' }} + + - name: Check the compiled extension made it into the wheel + run: | + python3 - wheelhouse/*.whl <<'EOF' + import sys, zipfile + for whl in sys.argv[1:]: + names = zipfile.ZipFile(whl).namelist() + assert any(n.startswith("moderngl/mgl.") and n.endswith(".so") for n in names), whl + print(whl, "ok") + EOF + + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: moderngl-${{ env.MODERNGL_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + path: ./wheelhouse/*.whl + if-no-files-found: error + + publish: + name: Publish moderngl ${{ inputs.version || '5.12.0' }} + needs: [setup, build_wheels] + permissions: + contents: write + pull-requests: write + uses: $/.github/workflows/_publish-wheel.yml + with: + artifact-pattern: moderngl-${{ inputs.version || '5.12.0' }}-*riscv64 From 6500fb48855e5d1d9b7629c01e1a27288ef5b949 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 11 Sep 2026 10:24:19 +0200 Subject: [PATCH 2/2] moderngl: fix musllinux EGL backend selection and deselect test_local --- .github/workflows/build-moderngl.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-moderngl.yml b/.github/workflows/build-moderngl.yml index d195d2824c..d8f0e919b6 100644 --- a/.github/workflows/build-moderngl.yml +++ b/.github/workflows/build-moderngl.yml @@ -60,16 +60,14 @@ jobs: CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ LIBGL_ALWAYS_SOFTWARE=1 # Upstream's own pytest suite (tests/, via a standalone EGL context - - # see tests/conftest.py) needs numpy/scipy/PyOpenGL, and it is the real - # test of the compiled extension - moderngl.mgl has zero build-time - # native deps (src/moderngl.cpp only calls GL through function pointers - # loaded by glcontext, our own riscv64 registry package), so nothing - # else exercises it. numpy/scipy have no musllinux riscv64 wheel on - # either PyPI or our registry (same gap as gotcha 253's kind), so - # musllinux gets the lighter EGL-context smoke test glcontext's own - # port already validated instead of the full suite. + # see tests/conftest.py) needs numpy/scipy/PyOpenGL, which have no + # musllinux riscv64 wheel on either PyPI or our registry, so musllinux + # gets the lighter EGL-context smoke test instead of the full suite. + # test_local.py asserts the tests dir sits next to an editable install + # (upstream's own Containerfile runs `setup.py build_ext --inplace` + # first); it never holds for a wheel installed into its own venv. CIBW_TEST_REQUIRES: ${{ matrix.libc == 'manylinux' && 'pytest numpy scipy PyOpenGL' || '' }} - CIBW_TEST_COMMAND: ${{ matrix.libc == 'manylinux' && 'python -m pytest {project}/tests -v' || 'python3 -c "import moderngl; ctx = moderngl.create_context(standalone=True); print(ctx.info); ctx.release()"' }} + CIBW_TEST_COMMAND: ${{ matrix.libc == 'manylinux' && 'python -m pytest {project}/tests -v -k "not test_local"' || 'python3 -c ''from glcontext import egl; import moderngl; ctx = moderngl.create_context(standalone=True, context=egl.create_context(glversion=330, mode="standalone")); print(ctx.info); ctx.release()''' }} - name: Check the compiled extension made it into the wheel run: |