Merge pull request #434 from kmilos/patch-1

CI: add macOS arm64 job Looks great, thank you!
mm2 · Feb 6, 2024 · 0233a32 · 0233a32
2 parents c2a5401 + efa3302
commit 0233a32
Showing 1 changed file with 25 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,70 +11,52 @@ permissions: read-all
 jobs:
 
   Ubuntu:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        runner: [ ubuntu-20.04, ubuntu-latest ]
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Build Ubuntu
         run: |
           ./configure --with-fastfloat --with-threaded
           make 
           make check
 
-  Ubuntu-20-04:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build Ubuntu
-        run: |
-          ./configure --with-fastfloat --with-threaded
-          make 
-          make check
-          
-  MacOS:
-    runs-on: macos-latest
+  macOS:
+    strategy:
+      matrix:
+        runner: [ macos-12, macos-14 ]
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Build MacOS
+      - uses: actions/checkout@v4
+      - name: Build macOS
         run: |
           ./configure --with-fastfloat --with-threaded
           make 
           make check        
     
-  Windows-64:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ilammy/msvc-dev-cmd@v1   
-        with:
-            arch: x64
-
-      - name: Build Windows 64 bit        
-        run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|x64" /Project testbed  
-
-      - name: Run tests               
-        run: testbed\testbed.exe --chdir testbed
-
-
-  Windows-32:
+  Windows:
+    strategy:
+      matrix:
+        arch: [ win32, x64 ]
     runs-on: windows-latest    
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1   
         with:
-            arch: win32
-
-      - name: Build Windows 32 bit       
-        run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|Win32" /Project testbed  
+            arch: ${{ matrix.arch }}
 
-      - name: Run tests          
+      - name: Build Windows
+        run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|${{ matrix.arch }}" /Project testbed  
+
+      - name: Run tests               
         run: testbed\testbed.exe --chdir testbed
-
-
+
   Ubuntu-meson:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install packages
         run: |
@@ -91,7 +73,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install packages
         run: |