CI: add macOS arm64 job to basic workflow

kevinbackhouse · Feb 6, 2024 · 36e3d55 · 36e3d55
1 parent e87bb73
commit 36e3d55
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -16,7 +16,7 @@ name: On PUSH - Basic CI for main platforms
 
 jobs:
   windows:
-    name: 'Win10 Arch:x64 BuildType:Release - SHARED'
+    name: 'Windows 10 - MSVC - Arch:X64 BuildType:Release - SHARED'
     runs-on: windows-2022
 
     steps:
@@ -27,11 +27,11 @@ jobs:
         with:
           arch: x64
 
-      - name: Restore conan cache
+      - name: Restore Conan cache
         uses: actions/cache@v4
         with:
-            path: ${{github.workspace}}/conanCache
-            key: ${{runner.os}}-push-win-${{ hashFiles('conanfile.py') }}
+          path: ${{github.workspace}}/conanCache
+          key: ${{runner.os}}-push-win-${{ hashFiles('conanfile.py') }}
 
       - name: Install Conan & Common config
         run: |
@@ -47,22 +47,21 @@ jobs:
           cmake --preset win-release -S . -B build
           cmake --build build --parallel
 
-
       - name: Test
         run: |
-          cd build
-          ctest --output-on-failure
+          ctest --test-dir build --output-on-failure
 
   Linux:
-    name: 'Ubuntu 22.04 - GCC - Arch:x64 BuildType:Release - SHARED'
+    name: 'Ubuntu 22.04 - GCC - Arch:X64 BuildType:Release - SHARED'
     runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          python3 -m pip install conan==1.* ninja
+          sudo eatmydata apt-get -y install ninja-build
+          python3 -m pip install conan==1.*
 
       - name: Conan
         run: |
@@ -72,35 +71,38 @@ jobs:
           conan profile show default
           conan install .. -o webready=True --build missing
 
-      - name: build and compile
+      - name: Build
         run: |
           cmake --preset linux-release -S . -B build
           cmake --build build --parallel
 
       - name: Test
         run: |
-          cd build
-          ctest --output-on-failure
+          ctest --test-dir build --output-on-failure
 
   MacOS:
-    name: 'MacOS - clang - Arch:x64 BuildType:Release - SHARED'
-    runs-on: macos-latest
+    name: 'macOS - XCode - Arch:${{ matrix.runner.arch }} BuildType:Release - SHARED'
+    runs-on: ${{ matrix.runner.os }}
+    strategy:
+      matrix:
+        runner:
+          - { os: macos-12, arch: X64   }
+          - { os: macos-14, arch: ARM64 }
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
           brew install ninja
           brew install inih
           brew install googletest
 
-      - name: build and compile
+      - name: Build
         run: |
           cmake --preset base_mac -S . -B build
           cmake --build build --parallel
 
       - name: Test
         run: |
-          cd build
-          ctest --output-on-failure
+          ctest --test-dir build --output-on-failure