Test

eric15342335 · Jun 13, 2024 · 51f845b · 51f845b
1 parent 0f0789e
commit 51f845b
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
@@ -165,23 +165,19 @@ jobs:
         if-no-files-found: error
   build-macos:
     timeout-minutes: 10
-    runs-on: ${{ matrix.config.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        # macos-12 for x64, macos-13-xlarge for arm64
+        os: [macos-12, macos-13-xlarge]
         config:
-            # macos-12 is for x64, while macos-14 is for arm64 (M1)
-            - {os: macos-12, CXX: g++, build_type: all}
-            - {os: macos-12, CXX: g++, build_type: release}
-            - {os: macos-12, CXX: clang++, build_type: all}
-            - {os: macos-12, CXX: clang++, build_type: release}
-            - {os: macos-12, CXX: cmake, build_type: Debug}
-            - {os: macos-latest, CXX: g++, build_type: all}
-            - {os: macos-latest, CXX: g++, build_type: release}
-            - {os: macos-latest, CXX: clang++, build_type: all}
-            - {os: macos-latest, CXX: clang++, build_type: release}
-            - {os: macos-latest, CXX: cmake, build_type: Debug}
-    name: "${{ matrix.config.os }} ${{ matrix.config.CXX }} ${{ matrix.config.build_type }}"
+            - {CXX: g++, build_type: all}
+            - {CXX: g++, build_type: release}
+            - {CXX: clang++, build_type: all}
+            - {CXX: clang++, build_type: release}
+            - {CXX: cmake, build_type: Debug}
+    name: "${{ matrix.os }} ${{ matrix.config.CXX }} ${{ matrix.config.build_type }}"
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -229,7 +225,7 @@ jobs:
         compression-level: 9
         if-no-files-found: error
   analyze:
-    needs: [build-windows, build-ubuntu, build-macos]
+    needs: [build-ubuntu]
     name: CodeQL Analysis (${{ matrix.language }})
     runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
@@ -261,7 +257,7 @@ jobs:
             category: "/language:${{matrix.language}}"
   clang-format:
     runs-on: ubuntu-latest
-    needs: [build-windows, build-ubuntu, build-macos]
+    needs: [build-ubuntu]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -270,7 +266,7 @@ jobs:
           make format-check
   coveralls:
     runs-on: ubuntu-latest
-    needs: [build-windows, build-ubuntu, build-macos]
+    needs: [build-ubuntu]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -285,7 +281,7 @@ jobs:
           make input-check
           coveralls --repo-token ${{ secrets.COVERALLS_REPO_TOKEN }}
   deploy:
-    needs: [analyze, clang-format, coveralls]
+    needs: [analyze, clang-format, coveralls, build-windows, build-macos]
     concurrency:
       group: "pages"
       cancel-in-progress: false