From 3d197c23539a54c75ccfa79ca83364e8a772a743 Mon Sep 17 00:00:00 2001
From: Nils Andreas Svee <me@lochnair.net>
Date: Tue, 11 Aug 2026 14:23:06 +0700
Subject: [PATCH] ci: expand test matrix to include musl and aarch64 targets

Consolidate check and test jobs into a matrix strategy to verify compatibility across x86_64 and aarch64 architectures for both glibc and musl toolchains.
---
 .github/workflows/ci.yml | 85 +++++++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b45a97f..2038e93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,32 +72,53 @@ jobs:
             --locked \
             -- -D warnings
 
-  check:
-    name: cargo check
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
+  verify:
+    name: cargo ${{ matrix.task }} (${{ matrix.target }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - task: check
+            runner: ubuntu-24.04
+            target: x86_64-unknown-linux-gnu
+            musl: false
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-        with:
-          persist-credentials: false
+          - task: test
+            runner: ubuntu-24.04
+            target: x86_64-unknown-linux-gnu
+            musl: false
 
-      - name: Install Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1
-        with:
-          cache-key: check
+          - task: check
+            runner: ubuntu-24.04
+            target: x86_64-unknown-linux-musl
+            musl: true
 
-      - name: Run check without default features
-        run: |
-          cargo check \
-            --workspace \
-            --no-default-features \
-            --locked
+          - task: test
+            runner: ubuntu-24.04
+            target: x86_64-unknown-linux-musl
+            musl: true
 
-  test:
-    name: cargo test
-    runs-on: ubuntu-latest
+          - task: check
+            runner: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-gnu
+            musl: false
+
+          - task: test
+            runner: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-gnu
+            musl: false
+
+          - task: check
+            runner: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-musl
+            musl: true
+
+          - task: test
+            runner: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-musl
+            musl: true
+
+    runs-on: ${{ matrix.runner }}
     timeout-minutes: 25
 
     steps:
@@ -106,24 +127,34 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Install musl toolchain
+        if: matrix.musl
+        run: |
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends musl-tools
+
       - name: Install Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1
         with:
-          cache-key: test
+          target: ${{ matrix.target }}
+          cache-key: ${{ matrix.task }}-${{ matrix.target }}
 
-      - name: Run tests
+      - name: Run ${{ matrix.task }} with all features
         run: |
-          cargo test \
+          cargo ${{ matrix.task }} \
             --workspace \
             --all-targets \
             --all-features \
+            --target ${{ matrix.target }} \
             --locked
 
-      - name: Run tests without default features
+      - name: Run ${{ matrix.task }} without default features
         run: |
-          cargo test \
+          cargo ${{ matrix.task }} \
             --workspace \
+            --all-targets \
             --no-default-features \
+            --target ${{ matrix.target }} \
             --locked
 
   docs: