From 1a797b3eb26e4be27dedb3bff112b06d481f5693 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Wed, 24 Jul 2024 09:48:59 -0700
Subject: [PATCH] arm64 ci

---
 .github/workflows/ci.yml | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2d4d7b0..40e98be1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,6 @@ jobs:
     - run: '& "C:\Program Files (x86)\System76\Keyboard Configurator\system76-keyboard-configurator.exe" --help-gtk'
 
   macos:
-    # TODO: `macos-14` runner uses Apple Silicon
     runs-on: macos-13
     steps:
     - run: brew install gtk+3 imagemagick librsvg adwaita-icon-theme
@@ -108,6 +107,40 @@ jobs:
     - run: '"./mnt/System76 Keyboard Configurator.app/Contents/MacOS/keyboard-configurator" --help-gtk'
     - run: 'open "mnt/System76 Keyboard Configurator.app" --args --help-gtk'
 
+  # `macos-14` runner uses Apple Silicon
+  macos-arm64:
+    runs-on: macos-14
+    steps:
+    - run: brew install gtk+3 imagemagick librsvg adwaita-icon-theme
+    - run: npm install -g appdmg
+    - run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+    - uses: actions/checkout@v2
+    - env:
+        AC_PASSWORD: ${{ github.event_name == 'release' && secrets.AC_PASSWORD || '' }}
+        AC_USERNAME: ${{ github.event_name == 'release' && secrets.AC_USERNAME || '' }}
+        MACOS_CERTIFICATE: ${{ github.event_name == 'release' && secrets.MACOS_CERTIFICATE || '' }}
+        MACOS_SCRIPT: ${{ github.event_name == 'release' && 'bash ./signing.sh' || 'python3 ./build.py' }}
+      run: cd macos && $MACOS_SCRIPT $RELEASE
+    - run: mv macos/keyboard-configurator.dmg macos/keyboard-configurator-arm64.dmg
+    - uses: actions/upload-artifact@v2
+      with:
+        if-no-files-found: error
+        name: keyboard-configurator-macos-arm64-${{ github.sha }}
+        path: macos/keyboard-configurator-arm64.dmg
+
+  macos-arm64-test:
+    runs-on: macos-14
+    needs: macos-arm64
+    steps:
+    - uses: actions/download-artifact@v2
+      with:
+        name: keyboard-configurator-macos-arm64-${{ github.sha }}
+    - run: mkdir mnt && hdiutil attach keyboard-configurator-arm64.dmg -mountpoint $PWD/mnt
+    - run: '"./mnt/System76 Keyboard Configurator.app/Contents/MacOS/keyboard-configurator" --help-gtk'
+    - run: 'open "mnt/System76 Keyboard Configurator.app" --args --help-gtk'
+
+
+
   upload-to-release:
     if: github.event_name == 'release'
     runs-on: ubuntu-latest