From 9c8f4ab765c43a6c1bc1f25de36fb93966778b30 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Thu, 11 Apr 2024 22:07:46 +1200
Subject: [PATCH] CI: add macOS (M1) runners

And bump all macos runners from 12 to 13.

Signed-off-by: Julian Oes <julian@oes.ch>
---
 .github/workflows/main.yml | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cd7d91b12c..8dae461d9e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -393,20 +393,31 @@ jobs:
 
   macOS:
     name: ${{ matrix.name }}
-    runs-on: macos-12
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
         include:
-          - name: macOS
+          - name: macOS x64
             build-framework: OFF
-          - name: macOS-framework
+            runner: macos-13
+            architecture: 'x64'
+          - name: macOS arm64
+            build-framework: OFF
+            runner: macos-14
+            architecture: 'arm64'
+          - name: macOS framework x64
+            build-framework: ON
+            runner: macos-13
+            architecture: 'x64'
+          - name: macOS framework arm64
             build-framework: ON
+            runner: macos-14
+            architecture: 'arm64'
     steps:
       - name: Install Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
-          architecture: 'x64'
       - uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -435,7 +446,7 @@ jobs:
         if: ${{ matrix.build-framework == 'ON' }}
         uses: actions/upload-artifact@v4
         with:
-          name: mavsdk_server_macos.framework
+          name: mavsdk_server_macos_${{ matrix.architecture }}.framework
           path: ./build/macos/src/mavsdk_server/src/mavsdk_server.framework
           retention-days: 2
       - name: Publish mavsdk_server_macos to github release
@@ -443,14 +454,14 @@ jobs:
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: 'build/macos/install/bin/mavsdk_server'
-          asset_name: 'mavsdk_server_macos'
+          file: build/macos/install/bin/mavsdk_server
+          asset_name: mavsdk_server_macos_${{ matrix.architecture }}
           tag: ${{ github.ref }}
           overwrite: true
 
   iOS:
     name: ${{ matrix.name }}
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         include:
@@ -499,7 +510,7 @@ jobs:
   iOS-XCFramework:
     name: iOS XCFramework
     needs: [macOS, iOS]
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with: