From 140b3655f8c1ecc89c36980d4c1a714c80531cc4 Mon Sep 17 00:00:00 2001
From: "Jae Lo Presti [j4]" <git@777.tf>
Date: Fri, 17 Jan 2025 10:37:52 +0200
Subject: [PATCH] feat: add matrix for native ARM64 builds

---
 .github/workflows/build.yml | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9f9222..720d41d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,28 +13,12 @@ on:
     types: [published]
 
 jobs:
-  buildLinuxArm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64
-      - name: Build Native Linux for ARM
-        run: |
-          docker run --rm --privileged tonistiigi/binfmt --install all
-          docker run --rm -v $(pwd):/workspace -w /workspace multiarch/debian-debootstrap:arm64-buster sh -c "
-            apt update &&
-            apt install -y make gcc g++ unzip &&
-            make -f Makefile.gnu all"
-      - uses: actions/upload-artifact@v4
-        with:
-          path: Dist/
-          name: arm-dist
-          retention-days: 1
+  build_matrix:
+    strategy:
+      matrix:
+        osver: ['ubuntu-latest', 'ubuntu-24.04-arm']
   buildLinux:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.osver }}
     container: debian:buster # Using debian buster environment for glibc backwards compatibility, see https://github.com/Yellow-Dog-Man/FreeImage/pull/12
     steps:
       - uses: actions/checkout@v4
@@ -62,7 +46,7 @@ jobs:
           name: android-dist
           retention-days: 1
   buildWindows:
-    needs: [buildLinux, buildLinuxArm]
+    needs: [buildLinux]
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v3