Support two macOS GitHub Actions runner images

- Update Linux and macOS GitHub Actions runner images - Fix GitHub Actions compilation on MinGW
nCine · Mar 12, 2024 · 3ddf743 · 3ddf743
1 parent 75430ae
commit 3ddf743
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -5,7 +5,7 @@ on: [push, workflow_dispatch]
 jobs:
   analyze:
     name: 'Analyze'
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -21,7 +21,7 @@ jobs:
         - CC: clang
           CXX: clang++
 
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     steps:
     - name: 'Checkout Code'

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,7 +13,10 @@ jobs:
   macOS:
     strategy:
       fail-fast: false
-    runs-on: 'macOS-11'
+      matrix:
+        os: [macOS-12, macOS-14]
+
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: 'Checkout Code'
@@ -45,7 +48,11 @@ jobs:
         export BRANCH_NAME=$(git describe --tags --exact-match 2> /dev/null || git symbolic-ref -q --short HEAD || git rev-parse --short HEAD)
         export DEPLOY_MESSAGE=`sed 's/BRANCH_NAME/'"$BRANCH_NAME"'/' <<< "$DEPLOY_MESSAGE"`
 
-        export OS=darwin
+        if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
+          export OS=macos14
+        else
+          export OS=macos12
+        fi
         export CC=appleclang
 
         cd ..

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -38,7 +38,7 @@ jobs:
       run: |
         $env:MSYSTEM = "MINGW64"
 
-        C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S cmake'
+        C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-cmake'
 
         if ("${{ matrix.CC }}" -eq "gcc") { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-gcc' }
         else { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-clang' }
@@ -59,7 +59,7 @@ jobs:
 
         $env:MSYSTEM = "MINGW64"
 
-        C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../ncline-build-Release -D CMAKE_BUILD_TYPE=Release'
+        C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../ncline-build-Release -D CMAKE_BUILD_TYPE=Release"
 
     - name: 'Make'
       env: