From 1ced87de0c984f33dddbe323e1fea7194e847e76 Mon Sep 17 00:00:00 2001
From: "Matthias J. Kannwischer" <matthias@zerorisc.com>
Date: Tue, 26 May 2026 19:05:26 +0800
Subject: [PATCH] CI: Move RISC-V runner jobs out of base into a dedicated
 workflow

Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>
---
 .github/workflows/all.yml   |  6 ++++++
 .github/workflows/base.yml  |  6 ------
 .github/workflows/riscv.yml | 38 +++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/riscv.yml

diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index 6eed804b20..9f232de9f1 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -34,6 +34,12 @@ jobs:
       id-token: 'write'
     uses: ./.github/workflows/nix.yml
     secrets: inherit
+  riscv:
+    name: RISC-V
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+    uses: ./.github/workflows/riscv.yml
   ci:
     name: Extended
     permissions:
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index e80df0c16b..353111b392 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -34,9 +34,6 @@ jobs:
            name: 'aarch64'
          - runner: ubuntu-latest
            name: 'x86_64'
-         # via https://riseproject-dev.github.io/riscv-runner/
-         - runner: ubuntu-24.04-riscv
-           name: 'riscv'
          - runner: macos-latest
            name: 'macos (aarch64)'
          - runner: macos-15-intel
@@ -71,9 +68,6 @@ jobs:
            name: 'aarch64'
          - runner: ubuntu-latest
            name: 'x86_64'
-         # via https://riseproject-dev.github.io/riscv-runner/
-         - runner: ubuntu-24.04-riscv
-           name: 'riscv'
         acvp-version: [v1.1.0.40, v1.1.0.41, v1.1.0.42]
         exclude:
           - {external: true,
diff --git a/.github/workflows/riscv.yml b/.github/workflows/riscv.yml
new file mode 100644
index 0000000000..a1613ed5d5
--- /dev/null
+++ b/.github/workflows/riscv.yml
@@ -0,0 +1,38 @@
+# Copyright (c) The mlkem-native project authors
+# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
+
+name: RISC-V
+permissions:
+  contents: read
+on:
+  workflow_call:
+  workflow_dispatch:
+jobs:
+  quickcheck:
+    name: Quickcheck (riscv)
+    # via https://riseproject-dev.github.io/riscv-runner/
+    runs-on: ubuntu-24.04-riscv
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: make quickcheck
+        run: |
+          OPT=0 make quickcheck
+          make clean >/dev/null
+          OPT=1 make quickcheck
+      - uses: ./.github/actions/setup-os
+      - name: tests func
+        run: |
+          ./scripts/tests func --check-namespace
+  quickcheck-acvp:
+    name: Quickcheck ACVP (riscv, ${{ matrix.acvp-version }})
+    strategy:
+      fail-fast: false
+      matrix:
+        acvp-version: [v1.1.0.40, v1.1.0.41, v1.1.0.42]
+    # via https://riseproject-dev.github.io/riscv-runner/
+    runs-on: ubuntu-24.04-riscv
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Run ACVP test
+        run: |
+          ./scripts/tests acvp --version ${{ matrix.acvp-version }}