From d447b7e19e54587744fc45704dbdbd7e61259062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <4973094+kmilos@users.noreply.github.com>
Date: Mon, 5 Feb 2024 16:54:57 +0100
Subject: [PATCH 1/3] CI: add macOS arm64 job

---
 .github/workflows/build.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5d6cce72..f2b07c49 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
   Ubuntu:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Build Ubuntu
         run: |
           ./configure --with-fastfloat --with-threaded
@@ -23,18 +23,21 @@ jobs:
   Ubuntu-20-04:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - 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 
@@ -44,7 +47,7 @@ jobs:
     runs-on: windows-latest
     
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1   
         with:
             arch: x64
@@ -59,7 +62,7 @@ jobs:
   Windows-32:
     runs-on: windows-latest    
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1   
         with:
             arch: win32
@@ -74,7 +77,7 @@ jobs:
   Ubuntu-meson:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install packages
         run: |
@@ -91,7 +94,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install packages
         run: |

From 348274b79f1af366c975b07242254a45b61e3850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <4973094+kmilos@users.noreply.github.com>
Date: Mon, 5 Feb 2024 18:05:47 +0100
Subject: [PATCH 2/3] CI: deduplicate Ubuntu jobs

---
 .github/workflows/build.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2b07c49..25ab5feb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,10 @@ 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@v4
       - name: Build Ubuntu
@@ -20,16 +23,6 @@ jobs:
           make 
           make check
 
-  Ubuntu-20-04:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build Ubuntu
-        run: |
-          ./configure --with-fastfloat --with-threaded
-          make 
-          make check
-          
   macOS:
     strategy:
       matrix:

From efa33021263fddb642231907e1f437d80028a4b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <4973094+kmilos@users.noreply.github.com>
Date: Mon, 5 Feb 2024 19:58:00 +0100
Subject: [PATCH 3/3] CI: deduplicate Windows jobs

---
 .github/workflows/build.yml | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25ab5feb..f511f8cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,37 +36,23 @@ jobs:
           make 
           make check        
     
-  Windows-64:
-    runs-on: windows-latest
-    
-    steps:
-      - uses: actions/checkout@v4
-      - 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@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: