ci: Add native macOS arm64 job

hebasto · Jan 31, 2024 · 06d60fd · 06d60fd
1 parent 0653a25
commit 06d60fd
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -586,18 +586,20 @@ jobs:
         if: ${{ always() }}
 
   macos-native:
-    name: "x86_64: macOS Monterey"
-    # See: https://github.com/actions/runner-images#available-images.
-    runs-on: macos-12 # Use M1 once available https://github.com/github/roadmap/issues/528
-
-    env:
-      CC: 'clang'
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
+    name: ${{ matrix.job.name }}
+    runs-on: ${{ matrix.job.runner }}
 
     strategy:
       fail-fast: false
       matrix:
+        job:
+          # See: https://github.com/actions/runner-images#available-images.
+          - name: 'x86_64: macOS Monterey, Valgrind'
+            runner: 'macos-12'
+            valgrind: 'yes'
+          - name: 'arm64: macOS Sonoma'
+            runner: 'macos-14'
+            valgrind: 'no'
         env_vars:
           - { WIDEMUL: 'int64',  RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
           - { WIDEMUL: 'int128_struct', ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 }
@@ -610,6 +612,12 @@ jobs:
           - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
           - BUILD: 'distcheck'
 
+    env:
+      CC: 'clang'
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      HOMEBREW_NO_INSTALL_CLEANUP: 1
+      WITH_VALGRIND: ${{ matrix.job.valgrind }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -620,6 +628,7 @@ jobs:
           ln -s $(brew --prefix gcc)/bin/gcc-?? /usr/local/bin/gcc
 
       - name: Install and cache Valgrind
+        if: ${{ runner.arch == 'X64' }}
         uses: ./.github/actions/install-homebrew-valgrind
 
       - name: CI script