Skip to content

Commit 5c05f81

Browse files
committed
Support two macOS GitHub Actions runner images
- Fix GitHub Actions compilation on MinGW - Update Linux and macOS GitHub Actions runner images
1 parent 546a1f1 commit 5c05f81

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

.github/workflows/android.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ARCH: [armeabi-v7a, arm64-v8a, x86_64]
2020
BuildType: [Debug, Release]
2121

22-
runs-on: 'ubuntu-20.04'
22+
runs-on: 'ubuntu-22.04'
2323

2424
steps:
2525
- name: 'Checkout Code'

.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on: [push, workflow_dispatch]
1010
jobs:
1111
analyze:
1212
name: 'Analyze'
13-
runs-on: 'ubuntu-20.04'
13+
runs-on: 'ubuntu-22.04'
1414

1515
strategy:
1616
fail-fast: false

.github/workflows/emscripten.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
BuildType: [Debug, Release, BinDist]
2121

22-
runs-on: 'ubuntu-20.04'
22+
runs-on: 'ubuntu-22.04'
2323

2424
steps:
2525
- name: 'Checkout Code'

.github/workflows/linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
CC: clang
4343
CXX: clang++
4444

45-
runs-on: 'ubuntu-20.04'
45+
runs-on: 'ubuntu-22.04'
4646

4747
steps:
4848
- name: 'Checkout Code'

.github/workflows/macos.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
BuildType: [Debug, Release, BinDist]
21+
os: [macOS-12, macOS-14]
2122

22-
runs-on: 'macOS-11'
23+
runs-on: ${{ matrix.os }}
2324

2425
steps:
2526
- name: 'Checkout Code'
@@ -32,7 +33,11 @@ jobs:
3233
3334
- name: 'Download nCine-libraries, nCine Artifacts, and project data'
3435
run: |
35-
export OS=darwin
36+
if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
37+
export OS=macos14
38+
else
39+
export OS=macos12
40+
fi
3641
export CC=appleclang
3742
export BRANCH_NAME=$(git describe --tags --exact-match 2> /dev/null || git symbolic-ref -q --short HEAD || git rev-parse --short HEAD)
3843
@@ -101,11 +106,14 @@ jobs:
101106
102107
export PROJECT_NAME=${GITHUB_REPOSITORY##*/}
103108
export BRANCH_NAME=$(git describe --tags --exact-match 2> /dev/null || git symbolic-ref -q --short HEAD || git rev-parse --short HEAD)
104-
export BRANCH_NAME=${GITHUB_REF#refs/heads/}
105109
export DEPLOY_MESSAGE=`sed 's/PROJECT_NAME/'"$PROJECT_NAME"'/' <<< "$DEPLOY_MESSAGE"`
106110
export DEPLOY_MESSAGE=`sed 's/BRANCH_NAME/'"$BRANCH_NAME"'/' <<< "$DEPLOY_MESSAGE"`
107111
108-
export OS=darwin
112+
if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
113+
export OS=macos14
114+
else
115+
export OS=macos12
116+
fi
109117
export CC=appleclang
110118
export PROJECT_EXT=dmg
111119

.github/workflows/mingw.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
run: |
6060
$env:MSYSTEM = "MINGW64"
6161
62-
C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-glew mingw-w64-x86_64-glfw mingw-w64-x86_64-SDL2 mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-libwebp mingw-w64-x86_64-lua cmake'
62+
C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-glew mingw-w64-x86_64-glfw mingw-w64-x86_64-SDL2 mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-libwebp mingw-w64-x86_64-lua mingw-w64-x86_64-cmake'
6363
6464
if ("${{ matrix.CC }}" -eq "gcc") { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-gcc' }
6565
else { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-clang' }
@@ -115,9 +115,9 @@ jobs:
115115
$env:MSYSTEM = "MINGW64"
116116
117117
if ("${{ matrix.BuildType }}" -eq "BinDist")
118-
{ C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../$PROJECT_NAME-build-${{ matrix.BuildType }} -D NCPROJECT_OPTIONS_PRESETS=${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine/lib/cmake/nCine' }
118+
{ C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../$env:PROJECT_NAME-build-${{ matrix.BuildType }} -D NCPROJECT_OPTIONS_PRESETS=${{ matrix.BuildType }} -D nCine_DIR=$(cygpath -m $PWD/../nCine/lib/cmake/nCine)" }
119119
else
120-
{ C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../$PROJECT_NAME-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine/lib/cmake/nCine' }
120+
{ C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../$env:PROJECT_NAME-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D nCine_DIR=$(cygpath -m $PWD/../nCine/lib/cmake/nCine)" }
121121
122122
- name: 'Make'
123123
env:

0 commit comments

Comments
 (0)