Skip to content

Commit 0f37165

Browse files
enceloencelo
committed
Update the GitHub Actions workflow files
- Remove the deprecated Windows Server 2019 runner image - Update the Linux runner images to Ubuntu 24.04 - Update the macOS runner image to macOS 15 - Query the number of available logical cores when building in parallel - Install make and patch when compiling on MSYS2 - Set IMGUI_VERSION_TAG to v1.91.9b-docking
1 parent ae939af commit 0f37165

File tree

7 files changed

+46
-70
lines changed

7 files changed

+46
-70
lines changed

‎.github/workflows/android.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
ARCH: [armeabi-v7a, arm64-v8a, x86_64]
1919
BuildType: [Debug, Release]
2020

21-
runs-on: 'ubuntu-22.04'
21+
runs-on: 'ubuntu-24.04'
2222

2323
steps:
2424
- name: 'Checkout Code'
@@ -27,7 +27,7 @@ jobs:
2727
- name: 'Install nCine Build Dependencies'
2828
run: |
2929
sudo apt-get update
30-
sudo apt-get install -y libgl1-mesa-dev
30+
sudo apt-get install -y libgl-dev libxext-dev
3131
3232
- name: 'Unshallow Git Repository for Versioning'
3333
run: |
@@ -72,11 +72,11 @@ jobs:
7272
- name: 'CMake Configuration and Make of nCine as a static library'
7373
run: |
7474
cd ../nCine
75-
export CMAKE_ARGS=" -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF -D NCINE_BUILD_ANDROID=ON -D NCINE_NDK_ARCHITECTURES=${{ matrix.ARCH }} -D CMAKE_PREFIX_PATH=$(pwd)/../nCine-external"
75+
export CMAKE_ARGS=" -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF -D NCINE_BUILD_ANDROID=ON -D NCINE_NDK_ARCHITECTURES=${{ matrix.ARCH }} -D CMAKE_PREFIX_PATH=$(pwd)/../nCine-external"
7676
7777
cmake $CMAKE_ARGS
7878
cd ..
79-
make -j2 -C nCine-build-${{ matrix.BuildType }}
79+
make -j $(getconf _NPROCESSORS_ONLN) -C nCine-build-${{ matrix.BuildType }}
8080
8181
- name: 'CMake Configuration'
8282
run: |
@@ -88,8 +88,10 @@ jobs:
8888
run: |
8989
export JAVA_HOME=$JAVA_HOME_17_X64
9090
export PROJECT_NAME=${GITHUB_REPOSITORY##*/}
91+
export MAKEFLAGS="-j $(getconf _NPROCESSORS_ONLN)"
92+
9193
cd ../$PROJECT_NAME-build-${{ matrix.BuildType }}/android
92-
gradle assemble${{ matrix.BuildType }}
94+
gradle assemble${{ matrix.BuildType }} --parallel
9395
9496
- name: 'Push Artifacts'
9597
env:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ on: [push, workflow_dispatch]
99
jobs:
1010
analyze:
1111
name: 'Analyze'
12-
runs-on: 'ubuntu-22.04'
12+
runs-on: 'ubuntu-24.04'
1313

1414
strategy:
1515
fail-fast: false
16-
matrix:
17-
language: [ 'cpp' ]
1816

1917
steps:
2018
- name: 'Checkout Repository'
@@ -23,12 +21,12 @@ jobs:
2321
- name: 'Initialize CodeQL'
2422
uses: github/codeql-action/init@v1
2523
with:
26-
languages: ${{ matrix.language }}
24+
languages: 'cpp'
2725

2826
- run: |
2927
# Install nCine Build Dependencies
3028
sudo apt-get update
31-
sudo apt-get install -y libgl1-mesa-dev
29+
sudo apt-get install -y libgl-dev libxext-dev
3230
3331
# Download nCine-libraries and project data
3432
export OS=linux
@@ -58,13 +56,13 @@ jobs:
5856
5957
# CMake Configuration and Make of nCine as a static library
6058
cd nCine
61-
export CMAKE_ARGS="-B ../nCine-build-$BuildType -D CMAKE_BUILD_TYPE=$BuildType -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
59+
export CMAKE_ARGS="-B ../nCine-build-$BuildType -D CMAKE_BUILD_TYPE=$BuildType -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
6260
6361
export CMAKE_ARGS="$CMAKE_ARGS -D CMAKE_PREFIX_PATH=$(pwd)/../nCine-external"
6462
6563
cmake $CMAKE_ARGS
6664
cd ..
67-
make -j2 -C nCine-build-Debug
65+
make -j $(getconf _NPROCESSORS_ONLN) -C nCine-build-Debug
6866
6967
# CMake Configuration and Make
7068
export PROJECT_NAME=${GITHUB_REPOSITORY##*/}
@@ -73,7 +71,7 @@ jobs:
7371
cmake -B ../$PROJECT_NAME-build-$BuildType -D CMAKE_PREFIX_PATH=$(pwd)/../nCine-external -D CMAKE_BUILD_TYPE=$BuildType -D nCine_DIR=$(pwd)/../nCine-build-$BuildType
7472
7573
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/../nCine-external/lib
76-
make -j2 -C ../$PROJECT_NAME-build-$BuildType
74+
make -j $(getconf _NPROCESSORS_ONLN) -C ../$PROJECT_NAME-build-$BuildType
7775
7876
- name: 'Perform CodeQL Analysis'
7977
uses: github/codeql-action/analyze@v1

‎.github/workflows/emscripten.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
BuildType: [Debug, Release, BinDist]
2020

21-
runs-on: 'ubuntu-22.04'
21+
runs-on: 'ubuntu-24.04'
2222

2323
steps:
2424
- name: 'Checkout Code'
@@ -78,11 +78,11 @@ jobs:
7878
else
7979
export NCINE_BUILD_TYPE=${{ matrix.BuildType }}
8080
fi
81-
export CMAKE_ARGS="-B ../nCine-build-$NCINE_BUILD_TYPE -D CMAKE_BUILD_TYPE=$NCINE_BUILD_TYPE -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
81+
export CMAKE_ARGS="-B ../nCine-build-$NCINE_BUILD_TYPE -D CMAKE_BUILD_TYPE=$NCINE_BUILD_TYPE -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
8282
8383
emcmake cmake $CMAKE_ARGS
8484
cd ..
85-
make -j2 -C nCine-build-$NCINE_BUILD_TYPE
85+
make -j $(getconf _NPROCESSORS_ONLN) -C nCine-build-$NCINE_BUILD_TYPE
8686
8787
- name: 'CMake Configuration'
8888
run: |
@@ -100,7 +100,7 @@ jobs:
100100
- name: 'Make'
101101
run: |
102102
export PROJECT_NAME=${GITHUB_REPOSITORY##*/}
103-
make -j2 -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}
103+
make -j $(getconf _NPROCESSORS_ONLN) -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}
104104
105105
- name: 'Package'
106106
if: matrix.BuildType == 'BinDist'

‎.github/workflows/linux.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
CC: clang
4242
CXX: clang++
4343

44-
runs-on: 'ubuntu-22.04'
44+
runs-on: 'ubuntu-24.04'
4545

4646
steps:
4747
- name: 'Checkout Code'
@@ -50,7 +50,7 @@ jobs:
5050
- name: 'Install nCine Build Dependencies'
5151
run: |
5252
sudo apt-get update
53-
sudo apt-get install -y libgl1-mesa-dev
53+
sudo apt-get install -y libgl-dev libxext-dev
5454
5555
- name: 'Unshallow Git Repository for Versioning'
5656
if: matrix.BuildType == 'BinDist'
@@ -93,15 +93,15 @@ jobs:
9393
else
9494
export NCINE_BUILD_TYPE=${{ matrix.BuildType }}
9595
fi
96-
export CMAKE_ARGS="-B ../nCine-build-$NCINE_BUILD_TYPE -D CMAKE_BUILD_TYPE=$NCINE_BUILD_TYPE -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
96+
export CMAKE_ARGS="-B ../nCine-build-$NCINE_BUILD_TYPE -D CMAKE_BUILD_TYPE=$NCINE_BUILD_TYPE -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
9797
9898
export CC= ${{ matrix.CC }}
9999
export CXX=${{ matrix.CXX }}
100100
export CMAKE_ARGS="$CMAKE_ARGS -D CMAKE_PREFIX_PATH=$(pwd)/../nCine-external"
101101
102102
cmake $CMAKE_ARGS
103103
cd ..
104-
make -j2 -C nCine-build-$NCINE_BUILD_TYPE
104+
make -j $(getconf _NPROCESSORS_ONLN) -C nCine-build-$NCINE_BUILD_TYPE
105105
106106
- name: 'CMake Configuration'
107107
run: |
@@ -124,7 +124,7 @@ jobs:
124124
export PROJECT_NAME=${GITHUB_REPOSITORY##*/}
125125
126126
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/../nCine-external/lib
127-
make -j2 -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}
127+
make -j $(getconf _NPROCESSORS_ONLN) -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}
128128
129129
- name: 'Package'
130130
if: matrix.BuildType == 'BinDist'

‎.github/workflows/macos.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
BuildType: [Debug, Release, BinDist]
20-
os: [macOS-13, macOS-14]
20+
os: [macOS-13, macOS-15]
2121

2222
runs-on: ${{ matrix.os }}
2323

@@ -32,8 +32,8 @@ jobs:
3232
3333
- name: 'Download nCine-libraries and project data'
3434
run: |
35-
if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
36-
export OS=macos14
35+
if [[ "${{ matrix.os }}" == "macOS-15" ]]; then
36+
export OS=macos15
3737
else
3838
export OS=macos13
3939
fi
@@ -70,11 +70,11 @@ jobs:
7070
else
7171
export NCINE_BUILD_TYPE=${{ matrix.BuildType }}
7272
fi
73-
export CMAKE_ARGS="-B ../nCine-build-$NCINE_BUILD_TYPE -D CMAKE_BUILD_TYPE=$NCINE_BUILD_TYPE -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
73+
export CMAKE_ARGS="-B ../nCine-build-$NCINE_BUILD_TYPE -D CMAKE_BUILD_TYPE=$NCINE_BUILD_TYPE -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
7474
7575
cmake $CMAKE_ARGS
7676
cd ..
77-
make -j2 -C nCine-build-$NCINE_BUILD_TYPE
77+
make -j $(getconf _NPROCESSORS_ONLN) -C nCine-build-$NCINE_BUILD_TYPE
7878
7979
- name: 'CMake Configuration'
8080
run: |
@@ -91,7 +91,7 @@ jobs:
9191
- name: 'Make'
9292
run: |
9393
export PROJECT_NAME=${GITHUB_REPOSITORY##*/}
94-
make -j2 -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}
94+
make -j $(getconf _NPROCESSORS_ONLN) -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}
9595
9696
- name: 'Package'
9797
if: matrix.BuildType == 'BinDist'
@@ -112,8 +112,8 @@ jobs:
112112
export DEPLOY_MESSAGE=`sed 's/PROJECT_NAME/'"$PROJECT_NAME"'/' <<< "$DEPLOY_MESSAGE"`
113113
export DEPLOY_MESSAGE=`sed 's/BRANCH_NAME/'"$BRANCH_NAME"'/' <<< "$DEPLOY_MESSAGE"`
114114
115-
if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
116-
export OS=macos14
115+
if [[ "${{ matrix.os }}" == "macOS-15" ]]; then
116+
export OS=macos15
117117
else
118118
export OS=macos13
119119
fi

‎.github/workflows/mingw.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
CC: clang
4242
CXX: clang++
4343

44-
runs-on: 'windows-2019'
44+
runs-on: 'windows-2022'
4545

4646
steps:
4747
- name: 'Checkout Code'
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
$env:MSYSTEM = "MINGW64"
6060
61-
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'
61+
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 make patch'
6262
6363
if ("${{ matrix.CC }}" -eq "gcc") { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-gcc' }
6464
else { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-clang' }
@@ -106,13 +106,13 @@ jobs:
106106
cd ../nCine
107107
if ("${{ matrix.BuildType }}" -eq "BinDist")
108108
{
109-
C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../nCine-build-Release -D CMAKE_BUILD_TYPE=Release -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
110-
C:\msys64\usr\bin\bash.exe -lc 'make -j2 -C ../nCine-build-Release'
109+
C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../nCine-build-Release -D CMAKE_BUILD_TYPE=Release -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
110+
C:\msys64\usr\bin\bash.exe -lc 'make -j $NUMBER_OF_PROCESSORS -C ../nCine-build-Release'
111111
}
112112
else
113113
{
114-
C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
115-
C:\msys64\usr\bin\bash.exe -lc 'make -j2 -C ../nCine-build-${{ matrix.BuildType }}'
114+
C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
115+
C:\msys64\usr\bin\bash.exe -lc 'make -j $NUMBER_OF_PROCESSORS -C ../nCine-build-${{ matrix.BuildType }}'
116116
}
117117
118118
- name: 'CMake Configuration'
@@ -137,7 +137,7 @@ jobs:
137137
$env:PROJECT_NAME = Split-Path -Path "$env:GITHUB_REPOSITORY" -leaf
138138
$env:MSYSTEM = "MINGW64"
139139
140-
C:\msys64\usr\bin\bash.exe -lc 'make -j2 -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}'
140+
C:\msys64\usr\bin\bash.exe -lc 'make -j $NUMBER_OF_PROCESSORS -C ../$PROJECT_NAME-build-${{ matrix.BuildType }}'
141141
142142
- name: 'Package'
143143
if: matrix.BuildType == 'BinDist'

‎.github/workflows/windows.yml‎

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
os: [windows-2019, windows-2022]
2019
BuildType: [Debug, Release, BinDist]
2120

22-
runs-on: ${{ matrix.os }}
21+
runs-on: 'windows-2022'
2322

2423
steps:
2524
- name: 'Checkout Code'
@@ -34,17 +33,12 @@ jobs:
3433
- name: 'Download nCine-libraries and project data'
3534
run: |
3635
$env:GIT_REDIRECT_STDERR = '2>&1'
37-
$env:vsversion = switch ("${{ matrix.os }}")
38-
{
39-
"windows-2022" {"vs2022"}
40-
"windows-2019" {"vs2019"}
41-
}
4236
4337
cd ..
4438
git clone https://github.com/nCine/nCine-libraries-artifacts.git
4539
cd nCine-libraries-artifacts
4640
47-
$env:LIBRARIES_BRANCH = $env:LIBRARIES_BRANCH -creplace "OS","windows" -creplace "COMPILER",$env:vsversion
41+
$env:LIBRARIES_BRANCH = $env:LIBRARIES_BRANCH -creplace "OS","windows" -creplace "COMPILER","vs2022"
4842
git checkout $env:LIBRARIES_BRANCH
4943
$env:LIBRARIES_FILE = Get-ChildItem -Path $(pwd) -Name -File | Select-Object -First 1
5044
7z x $env:LIBRARIES_FILE
@@ -67,46 +61,34 @@ jobs:
6761
6862
- name: 'CMake Configuration and Make of nCine as a static library'
6963
run: |
70-
$env:generator = switch ("${{ matrix.os }}")
71-
{
72-
"windows-2022" {"Visual Studio 17 2022"}
73-
"windows-2019" {"Visual Studio 16 2019"}
74-
}
75-
7664
cd ../nCine
7765
if ("${{ matrix.BuildType }}" -eq "BinDist")
7866
{ $nCineBuildType = "Release" }
7967
else
8068
{ $nCineBuildType = "${{ matrix.BuildType }}" }
8169
82-
cmake -G "$env:generator" -A x64 -B ../nCine-build-$nCineBuildType -D CMAKE_BUILD_TYPE=$nCineBuildType -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF
70+
cmake -G "Visual Studio 17 2022" -A x64 -B ../nCine-build-$nCineBuildType -D CMAKE_BUILD_TYPE=$nCineBuildType -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.91.9b-docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF
8371
8472
cd ..
85-
cmake --build nCine-build-$nCineBuildType --config $nCineBuildType
73+
cmake --build nCine-build-$nCineBuildType --config $nCineBuildType -j $env:NUMBER_OF_PROCESSORS
8674
8775
- name: 'CMake Configuration'
8876
run: |
8977
$env:project_name = Split-Path -Path "$env:GITHUB_REPOSITORY" -leaf
9078
91-
$env:generator = switch ("${{ matrix.os }}")
92-
{
93-
"windows-2022" {"Visual Studio 17 2022"}
94-
"windows-2019" {"Visual Studio 16 2019"}
95-
}
96-
9779
if ("${{ matrix.BuildType }}" -eq "BinDist")
98-
{ cmake -G "$env:generator" -A x64 -B ../$env:project_name-build-${{ matrix.BuildType }} -D NCPROJECT_OPTIONS_PRESETS=${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine-build-Release }
80+
{ cmake -G "Visual Studio 17 2022" -A x64 -B ../$env:project_name-build-${{ matrix.BuildType }} -D NCPROJECT_OPTIONS_PRESETS=${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine-build-Release }
9981
else
100-
{ cmake -G "$env:generator" -A x64 -B ../$env:project_name-build-${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine-build-${{ matrix.BuildType }} }
82+
{ cmake -G "Visual Studio 17 2022" -A x64 -B ../$env:project_name-build-${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine-build-${{ matrix.BuildType }} }
10183
10284
- name: 'CMake Build'
10385
run: |
10486
$env:project_name = Split-Path -Path "$env:GITHUB_REPOSITORY" -leaf
10587
10688
if ("${{ matrix.BuildType }}" -eq "BinDist")
107-
{ cmake --build ../$env:project_name-build-${{ matrix.BuildType }} --config Release }
89+
{ cmake --build ../$env:project_name-build-${{ matrix.BuildType }} --config Release -j $env:NUMBER_OF_PROCESSORS }
10890
else
109-
{ cmake --build ../$env:project_name-build-${{ matrix.BuildType }} --config ${{ matrix.BuildType }} }
91+
{ cmake --build ../$env:project_name-build-${{ matrix.BuildType }} --config ${{ matrix.BuildType }} -j $env:NUMBER_OF_PROCESSORS }
11092
11193
- name: 'Package'
11294
if: matrix.BuildType == 'BinDist'
@@ -128,15 +110,9 @@ jobs:
128110
$env:DEPLOY_MESSAGE = $env:DEPLOY_MESSAGE -creplace "PROJECT_NAME",$env:project_name
129111
$env:DEPLOY_MESSAGE = $env:DEPLOY_MESSAGE -creplace "BRANCH_NAME",$env:branch_name
130112
131-
$env:vsversion = switch ("${{ matrix.os }}")
132-
{
133-
"windows-2022" {"vs2022"}
134-
"windows-2019" {"vs2019"}
135-
}
136-
137113
$env:DEPLOY_BRANCH = $env:DEPLOY_BRANCH -creplace "PROJECT_NAME",$env:project_name
138114
$env:DEPLOY_BRANCH = $env:DEPLOY_BRANCH -creplace "BRANCH_NAME",$env:branch_name
139-
$env:DEPLOY_BRANCH = $env:DEPLOY_BRANCH -creplace "OS","windows" -creplace "COMPILER",$env:vsversion
115+
$env:DEPLOY_BRANCH = $env:DEPLOY_BRANCH -creplace "OS","windows" -creplace "COMPILER","vs2022"
140116
141117
Write-Output $env:project_name
142118
Write-Output $env:branch_name

0 commit comments

Comments
 (0)