From 23d6d13099eb0d18707c4bb22b626bce511f98b0 Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Tue, 26 Nov 2024 15:27:56 +0100
Subject: [PATCH] ci: build arm64 for all platforms

Now that Windows arm64 is also supported, we can add it to CI and simplify the pipeline while at it.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
---
 .github/workflows/ci.yml | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e98a3f..ccf4c65 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,25 +26,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-12, windows-2019, ubuntu-20.04]
-        arch: [x86, x64]
+        arch: [x86, x64, arm64]
         include:
           - os: macos-12
             friendlyName: macOS
             targetPlatform: macOS
-          - os: macos-12
-            friendlyName: macOS
-            targetPlatform: macOS
-            arch: arm64
           - os: windows-2019
             friendlyName: Windows
             targetPlatform: win32
           - os: ubuntu-20.04
             friendlyName: Linux
             targetPlatform: ubuntu
-          - os: ubuntu-20.04
-            friendlyName: Linux
-            targetPlatform: ubuntu
-            arch: arm64
           - os: ubuntu-20.04
             friendlyName: Linux
             targetPlatform: ubuntu
@@ -121,15 +113,7 @@ jobs:
           sudo dpkg --add-architecture armhf
           sudo apt-get update
           sudo apt-get install -y gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabihf libcurl4-gnutls-dev:armhf zlib1g-dev:armhf libssl-dev:armhf gettext
-      - name: Build (except macOS arm64)
-        if: matrix.targetPlatform != 'macOS' || matrix.arch != 'arm64'
-        shell: bash
-        run: script/build.sh
-        env:
-          TARGET_PLATFORM: ${{ matrix.targetPlatform }}
-          TARGET_ARCH: ${{ matrix.arch }}
-      - name: Build (macOS arm64)
-        if: matrix.targetPlatform == 'macOS' && matrix.arch == 'arm64'
+      - name: Build
         shell: bash
         run: script/build.sh
         env: