From 514f92a3a33707d539cd9c2bab9b3a92bced33ec Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 11 Sep 2026 10:35:06 +0200 Subject: [PATCH 1/3] tombi: add build-tombi.yml for riscv64 wheels --- .github/workflows/build-tombi.yml | 154 ++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 .github/workflows/build-tombi.yml diff --git a/.github/workflows/build-tombi.yml b/.github/workflows/build-tombi.yml new file mode 100644 index 000000000..489c7d73e --- /dev/null +++ b/.github/workflows/build-tombi.yml @@ -0,0 +1,154 @@ +# SPDX-FileCopyrightText: 2026 The RISE Project +# SPDX-License-Identifier: MIT +--- +# This workflow is based on the `linux` job of +# https://github.com/tombi-toml/tombi/blob/v1.4.1/.github/workflows/release_pypi.yml +name: Build tombi wheels (riscv64) + +on: + workflow_dispatch: + inputs: + version: + description: 'tombi version to build (git tag without the leading v, e.g. 1.4.1)' + required: true + default: '1.4.1' + pull_request: + paths: + - '.github/workflows/build-tombi.yml' + +concurrency: + group: ${{ github.workflow }}-${{ inputs.version || '1.4.1' }}-${{ 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 1.4.1 there. + TOMBI_VERSION: ${{ inputs.version || '1.4.1' }} + +jobs: + setup: + uses: $/.github/workflows/_setup.yml + + build_wheel: + needs: [setup] + name: Build tombi ${{ inputs.version || '1.4.1' }} manylinux_riscv64 + runs-on: ubuntu-24.04-riscv + timeout-minutes: 360 + + steps: + - name: Checkout tombi v${{ env.TOMBI_VERSION }} + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: tombi-toml/tombi + ref: v${{ env.TOMBI_VERSION }} + persist-credentials: false + + # pyproject.toml/Cargo.toml both pin the placeholder "0.0.0-dev" upstream's + # own `cargo xtask set-version` replaces from GITHUB_REF at release time + # (xtask/src/command/set_version.rs); reproduce just the two patches this + # build needs instead of running xtask itself. + - name: Set version + run: | + sed -i "s/^version = \"0.0.0-dev\".*/version = \"${TOMBI_VERSION}\"/" pyproject.toml Cargo.toml + + # `[tool.maturin] bindings = "bin"`: the wheel is one compiled executable + # with no ABI tag, so a single native build covers every interpreter. + - name: Build wheel + uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0 + with: + command: build + target: riscv64gc-unknown-linux-gnu + args: --release --locked --out dist + manylinux: '2_39' + before-script-linux: git config --global --add safe.directory "*" + + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: tombi-${{ env.TOMBI_VERSION }}-manylinux_riscv64 + path: dist/*.whl + if-no-files-found: error + + test_wheel: + name: Test tombi ${{ inputs.version || '1.4.1' }} on Python ${{ matrix.python-version }} + needs: [setup, build_wheel] + runs-on: ubuntu-24.04-riscv + timeout-minutes: 30 + env: + # Without this uv would reuse the runner image's system CPython for 3.12 + # and download a standalone build for the others. + UV_PYTHON_PREFERENCE: only-managed + strategy: + fail-fast: false + matrix: + # This repo's default interpreter matrix (gotcha in workflow-anatomy.md); + # the wheel is interpreter-agnostic (bindings = "bin"), so every + # interpreter -- including free-threaded -- exercises the same binary. + python-version: ['3.12', '3.13', '3.14', '3.14t'] + + steps: + - name: Download wheel + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 + with: + name: tombi-${{ env.TOMBI_VERSION }}-manylinux_riscv64 + + - name: Install Python + uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + with: + python-version: ${{ matrix.python-version }} + activate-environment: true + enable-cache: false + + - name: Install wheel + run: uv pip install --reinstall --no-index --find-links . tombi + + # Mirrors upstream's own `uv run --frozen pytest` (python/tombi/tests): + # the wheel also ships an importable `tombi` module (python-source = + # "python/tombi/src") whose whole job is exposing __version__. + - name: Test wheel + run: | + set -euo pipefail + python -c "import tombi; print(tombi.__version__); assert tombi.__version__ == '${TOMBI_VERSION}'" + + tombi --version + tombi --help >/dev/null + + work=$(mktemp -d) + cat > "$work/bad.toml" <<'TOML' + [package + name = "oops" + TOML + + set +e + out=$(tombi lint --offline "$work/bad.toml" 2>&1) + rc=$? + set -e + echo "$out" + [ "$rc" -ne 0 ] + + cat > "$work/messy.toml" <<'TOML' + [package] + name = "demo" + version="0.1.0" + TOML + + set +e + tombi format --offline --check "$work/messy.toml" + rc=$? + set -e + [ "$rc" -ne 0 ] + + tombi format --offline "$work/messy.toml" + tombi format --offline --check "$work/messy.toml" + grep -q 'name = "demo"' "$work/messy.toml" + + publish: + name: Publish tombi ${{ inputs.version || '1.4.1' }} + needs: [setup, build_wheel, test_wheel] + permissions: + contents: write + pull-requests: write + uses: $/.github/workflows/_publish-wheel.yml + with: + artifact-pattern: tombi-${{ inputs.version || '1.4.1' }}-manylinux_riscv64 From 575ce88513156305b9d1597620b6faa5bc621375 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 11 Sep 2026 10:48:16 +0200 Subject: [PATCH 2/3] tombi: drop --locked, Cargo.lock needs updating after version patch --- .github/workflows/build-tombi.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-tombi.yml b/.github/workflows/build-tombi.yml index 489c7d73e..2db0be0d0 100644 --- a/.github/workflows/build-tombi.yml +++ b/.github/workflows/build-tombi.yml @@ -55,12 +55,15 @@ jobs: # `[tool.maturin] bindings = "bin"`: the wheel is one compiled executable # with no ABI tag, so a single native build covers every interpreter. + # No `--locked` (unlike build-taplo.yml/build-git-cliff.yml, and matching + # upstream's own release_pypi.yml): the version patch above leaves + # Cargo.lock's workspace-local entries stale, so cargo needs to update it. - name: Build wheel uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0 with: command: build target: riscv64gc-unknown-linux-gnu - args: --release --locked --out dist + args: --release --out dist manylinux: '2_39' before-script-linux: git config --global --add safe.directory "*" From 31e38e832a672e801bbe5d6bf22a5cad80f0c497 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 11 Sep 2026 18:18:00 +0200 Subject: [PATCH 3/3] tombi: bump build timeout to 24h, heavy dependency tree stalls at 6h --- .github/workflows/build-tombi.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-tombi.yml b/.github/workflows/build-tombi.yml index 2db0be0d0..312924267 100644 --- a/.github/workflows/build-tombi.yml +++ b/.github/workflows/build-tombi.yml @@ -35,7 +35,9 @@ jobs: needs: [setup] name: Build tombi ${{ inputs.version || '1.4.1' }} manylinux_riscv64 runs-on: ubuntu-24.04-riscv - timeout-minutes: 360 + # tombi-cli pulls in tower-lsp/tokio/reqwest/rayon, well beyond the other + # maturin bindings=bin CLIs here; the default 360m timed out mid-link. + timeout-minutes: 1440 steps: - name: Checkout tombi v${{ env.TOMBI_VERSION }}