From 4231c48a9c9adf451efcacecfd82278cab2c43a4 Mon Sep 17 00:00:00 2001
From: Nuno Cruces <ncruces@users.noreply.github.com>
Date: Tue, 21 Jan 2025 18:12:48 +0000
Subject: [PATCH] CI: use Linux ARM runners. (#2366)

Signed-off-by: Nuno Cruces <ncruces@users.noreply.github.com>
---
 .github/workflows/commit.yaml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
index d36bc78b8f..3db9380ac7 100644
--- a/.github/workflows/commit.yaml
+++ b/.github/workflows/commit.yaml
@@ -106,18 +106,22 @@ jobs:
         run: bash <(curl -s https://codecov.io/bash)
 
   test_scratch:
-    name: ${{ matrix.arch }}, Linux (scratch), Go-${{ matrix.go-version }}
-    runs-on: ubuntu-22.04
+    name: ${{ matrix.platform.arch }}, Linux (scratch), Go-${{ matrix.go-version }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
       fail-fast: false  # don't fail fast as sometimes failures are arch/OS specific
       matrix:  # Use versions consistent with wazero's Go support policy.
         go-version:
           - "1.23"  # Current Go version
           - "1.21"  # Floor Go version of wazero (current - 2)
-        arch:
-          - "amd64"
-          - "arm64"
-          - "riscv64"
+        platform:
+          - os: ubuntu-22.04
+            arch: amd64
+          - os: ubuntu-22.04-arm
+            arch: arm64
+          - os: ubuntu-22.04
+            arch: riscv64
+            qemu: true
 
     steps:
 
@@ -132,11 +136,11 @@ jobs:
           go list -f '{{.Dir}}' ./... | egrep -v 'spectest' | xargs -Ipkg go test pkg -c -o pkg.test
           go build -o wazerocli ./cmd/wazero
         env:
-          GOARCH: ${{ matrix.arch }}
+          GOARCH: ${{ matrix.platform.arch }}
           CGO_ENABLED: 0
 
       - name: Set up QEMU
-        if: ${{ matrix.arch != 'amd64' }}
+        if: ${{ matrix.platform.qemu }}
         uses: docker/setup-qemu-action@v3
         with:  # Avoid docker.io rate-limits; built with internal-images.yml
           image: ghcr.io/tetratelabs/wazero/internal-binfmt
@@ -146,11 +150,11 @@ jobs:
         run: |
           echo 'FROM scratch' >> Dockerfile
           echo 'CMD ["/test"]' >> Dockerfile
-          docker buildx build -t wazero:test --platform linux/${{ matrix.arch }} .
+          docker buildx build -t wazero:test --platform linux/${{ matrix.platform.arch }} .
 
       - name: Run built test binaries
         # This runs all tests compiled above in sequence. Note: This mounts /tmp to allow t.TempDir() in tests.
-        run: find . -name "*.test" | xargs -Itestbin docker run --platform linux/${{ matrix.arch }} -v $(pwd)/testbin:/test -v $(pwd)/wazerocli:/wazero -e WAZEROCLI=/wazero --tmpfs /tmp --rm -t wazero:test
+        run: find . -name "*.test" | xargs -Itestbin docker run --platform linux/${{ matrix.platform.arch }} -v $(pwd)/testbin:/test -v $(pwd)/wazerocli:/wazero -e WAZEROCLI=/wazero --tmpfs /tmp --rm -t wazero:test
 
   test_bsd:
     name: amd64, ${{ matrix.os.name }}