cd: macos arch fixes and ubuntu bump

eladyn · Dec 30, 2024 · e9e79e5 · e9e79e5
1 parent a6b4da7
commit e9e79e5
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -10,11 +10,11 @@ on:
 
 jobs:
   build:
-    name: Publishing ${{ matrix.build_target }}-${{ matrix.artifact_type }}
+    name: Building ${{ matrix.build_target }}-${{ matrix.artifact_type }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build_target: [macos, linux, linux-armhf, linux-armv6]
+        build_target: [macos, macos-aarch64, linux, linux-armhf, linux-armv6]
         rust: [stable]
         artifact_type: ['slim', 'default', 'full']  # The build strategy will build all types for each OS specified
         include:
@@ -28,16 +28,20 @@ jobs:
             os: macos-latest
             artifact_prefix: macos
             target: x86_64-apple-darwin
+          - build_target: macos-aarch64
+            os: macos-latest
+            artifact_prefix: macos-aarch64
+            target: x86_64-apple-darwin
           - build_target: linux
             os: ubuntu-latest
             artifact_prefix: linux
             target: x86_64-unknown-linux-gnu
           - build_target: linux-armhf
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             artifact_prefix: linux-armhf
             target: arm-unknown-linux-gnueabihf
           - build_target: linux-armv6
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             artifact_prefix: linux-armv6
             target: arm-unknown-linux-gnueabihf
           - build_target: macos
@@ -85,9 +89,12 @@ jobs:
           override: true
       - name: Installing needed macOS dependencies
         if: matrix.os == 'macos-latest'
-        run: brew install awk dbus pkg-config portaudio
+        run: |
+          brew install awk dbus pkg-config portaudio
+          echo SDKROOT=$(xcrun -sdk macosx --show-sdk-path) >> $GITHUB_ENV
+          echo MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)
       - name: Installing needed Ubuntu dependencies
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04'
+        if: startsWith(matrix.os, 'ubuntu')
         run: |
           sudo apt-get update
           sudo apt-get install -y -qq libasound2-dev libssl-dev libpulse-dev libdbus-1-dev