From f0c0fdc6cf097ba097af6e1117ea3e2d7f9b7748 Mon Sep 17 00:00:00 2001
From: Gerwin Klein <gerwin.klein@proofcraft.systems>
Date: Sun, 14 Jun 2026 10:00:43 +1000
Subject: [PATCH] github: use new build matrix

Use the new build matrix from ci-action that supports build subgroups
for armv8a. This should speed up the hw-build from >50min to about
12:30min, now bounded by the riscv group, not armv8a.

Signed-off-by: Gerwin Klein <gerwin.klein@proofcraft.systems>
---
 .github/workflows/sel4test-deploy.yml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sel4test-deploy.yml b/.github/workflows/sel4test-deploy.yml
index 72d9e7e5c..75b226755 100644
--- a/.github/workflows/sel4test-deploy.yml
+++ b/.github/workflows/sel4test-deploy.yml
@@ -32,6 +32,17 @@ jobs:
         manifest_repo: sel4test-manifest
         manifest: master.xml
 
+  build-matrix:
+    name: Build Matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+    - id: matrix
+      uses: seL4/ci-actions/sel4test-hw-matrix@master
+      with:
+        matrix: build
+
   sim:
     name: Simulation
     needs: code
@@ -49,13 +60,10 @@ jobs:
 
   hw-build:
     name: HW Build
-    needs: code
+    needs: [code, build-matrix]
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        # There is no "rv32imac" hardware yet.
-        march: [armv7a, armv8a, nehalem, rv64imac]
-        compiler: [gcc, clang]
+      matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
     steps:
     - name: Build
       uses: seL4/ci-actions/sel4test-hw@master
@@ -63,10 +71,11 @@ jobs:
         xml: ${{ needs.code.outputs.xml }}
         march: ${{ matrix.march }}
         compiler: ${{ matrix.compiler }}
+        subgroup: ${{ matrix.subgroup }}
     - name: Upload images
       uses: actions/upload-artifact@v7
       with:
-        name: images-${{ matrix.march }}-${{ matrix.compiler }}
+        name: images-${{ matrix.march }}-${{ matrix.compiler }}${{ matrix.subgroup && format('-{0}', matrix.subgroup) }}
         path: '*-images.tar.gz'
 
   the_matrix:
@@ -83,7 +92,7 @@ jobs:
     name: HW Run
     if: ${{ github.repository_owner == 'seL4' }}
     runs-on: ubuntu-latest
-    needs: [sim, the_matrix]
+    needs: [the_matrix]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.the_matrix.outputs.matrix) }}
@@ -98,7 +107,7 @@ jobs:
       - name: Download image
         uses: actions/download-artifact@v8
         with:
-          name: images-${{ matrix.march }}-${{ matrix.compiler }}
+          name: images-${{ matrix.march }}-${{ matrix.compiler }}${{ matrix.subgroup && format('-{0}', matrix.subgroup) }}
       - name: Run
         uses: seL4/ci-actions/sel4test-hw-run@master
         with: