Skip to content

Commit 37cbac1

Browse files
enceloencelo
committed
Use an env variable for ImGui version in workflows
- Set IMGUI_VERSION_TAG to v1.92.4-docking for GitHub Actions builds - Update Intel macOS GitHub Actions runner to 15 - Update nCine build dependencies for Ubuntu runner
1 parent 13d877d commit 37cbac1

File tree

7 files changed

+21
-14
lines changed

7 files changed

+21
-14
lines changed

‎.github/workflows/android.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77
"Push artifact from GitHub Actions build ${{ github.run_number }} with id ${{ github.run_id }}
88
99
- PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}"
10+
IMGUI_VERSION_TAG: v1.92.4-docking
1011

1112
on: [push, workflow_dispatch]
1213

@@ -27,7 +28,7 @@ jobs:
2728
- name: 'Install nCine Build Dependencies'
2829
run: |
2930
sudo apt-get update
30-
sudo apt-get install -y libgl-dev libxext-dev
31+
sudo apt-get install -y libgl-dev libxext-dev libxrandr-dev libwayland-dev
3132
3233
- name: 'Unshallow Git Repository for Versioning'
3334
run: |
@@ -72,7 +73,7 @@ jobs:
7273
- name: 'CMake Configuration and Make of nCine as a static library'
7374
run: |
7475
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=v1.92.1-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"
76+
export CMAKE_ARGS=" -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=$IMGUI_VERSION_TAG -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"
7677
7778
cmake $CMAKE_ARGS
7879
cd ..

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: 'CodeQL'
33
env:
44
LIBRARIES_BRANCH: libraries-OS-COMPILER
55
NCINE_SOURCE_BRANCH: BRANCH_NAME
6+
IMGUI_VERSION_TAG: v1.92.4-docking
67

78
on: [push, workflow_dispatch]
89

@@ -26,7 +27,7 @@ jobs:
2627
- run: |
2728
# Install nCine Build Dependencies
2829
sudo apt-get update
29-
sudo apt-get install -y libgl-dev libxext-dev
30+
sudo apt-get install -y libgl-dev libxext-dev libxrandr-dev libwayland-dev
3031
3132
# Download nCine-libraries and project data
3233
export OS=linux
@@ -56,7 +57,7 @@ jobs:
5657
5758
# CMake Configuration and Make of nCine as a static library
5859
cd nCine
59-
export CMAKE_ARGS="-B ../nCine-build-$BuildType -D CMAKE_BUILD_TYPE=$BuildType -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=v1.92.1-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"
60+
export CMAKE_ARGS="-B ../nCine-build-$BuildType -D CMAKE_BUILD_TYPE=$BuildType -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=$IMGUI_VERSION_TAG -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"
6061
6162
export CMAKE_ARGS="$CMAKE_ARGS -D CMAKE_PREFIX_PATH=$(pwd)/../nCine-external"
6263

‎.github/workflows/emscripten.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
99
- PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}"
1010
DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
11+
IMGUI_VERSION_TAG: v1.92.4-docking
1112

1213
on: [push, workflow_dispatch]
1314

@@ -78,7 +79,7 @@ jobs:
7879
else
7980
export NCINE_BUILD_TYPE=${{ matrix.BuildType }}
8081
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=v1.92.1-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"
82+
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=$IMGUI_VERSION_TAG -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"
8283
8384
emcmake cmake $CMAKE_ARGS
8485
cd ..

‎.github/workflows/linux.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
99
- PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}"
1010
DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
11+
IMGUI_VERSION_TAG: v1.92.4-docking
1112

1213
on: [push, workflow_dispatch]
1314

@@ -50,7 +51,7 @@ jobs:
5051
- name: 'Install nCine Build Dependencies'
5152
run: |
5253
sudo apt-get update
53-
sudo apt-get install -y libgl-dev libxext-dev
54+
sudo apt-get install -y libgl-dev libxext-dev libxrandr-dev libwayland-dev
5455
5556
- name: 'Unshallow Git Repository for Versioning'
5657
if: matrix.BuildType == 'BinDist'
@@ -93,7 +94,7 @@ jobs:
9394
else
9495
export NCINE_BUILD_TYPE=${{ matrix.BuildType }}
9596
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=v1.92.1-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"
97+
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=$IMGUI_VERSION_TAG -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"
9798
9899
export CC= ${{ matrix.CC }}
99100
export CXX=${{ matrix.CXX }}

‎.github/workflows/macos.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
99
- PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}"
1010
DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
11+
IMGUI_VERSION_TAG: v1.92.4-docking
1112

1213
on: [push, workflow_dispatch]
1314

@@ -17,7 +18,7 @@ jobs:
1718
fail-fast: false
1819
matrix:
1920
BuildType: [Debug, Release, BinDist]
20-
os: [macOS-13, macOS-15]
21+
os: [macOS-15, macOS-15-intel]
2122

2223
runs-on: ${{ matrix.os }}
2324

@@ -35,7 +36,7 @@ jobs:
3536
if [[ "${{ matrix.os }}" == "macOS-15" ]]; then
3637
export OS=macos15
3738
else
38-
export OS=macos13
39+
export OS=macos15-intel
3940
fi
4041
export CC=appleclang
4142
@@ -70,7 +71,7 @@ jobs:
7071
else
7172
export NCINE_BUILD_TYPE=${{ matrix.BuildType }}
7273
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=v1.92.1-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"
74+
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=$IMGUI_VERSION_TAG -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"
7475
7576
cmake $CMAKE_ARGS
7677
cd ..
@@ -115,7 +116,7 @@ jobs:
115116
if [[ "${{ matrix.os }}" == "macOS-15" ]]; then
116117
export OS=macos15
117118
else
118-
export OS=macos13
119+
export OS=macos15-intel
119120
fi
120121
export CC=appleclang
121122
export PROJECT_EXT=dmg

‎.github/workflows/mingw.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
99
- PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}"
1010
DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
11+
IMGUI_VERSION_TAG: v1.92.4-docking
1112

1213
on: [push, workflow_dispatch]
1314

@@ -106,12 +107,12 @@ jobs:
106107
cd ../nCine
107108
if ("${{ matrix.BuildType }}" -eq "BinDist")
108109
{
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.92.1-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 "cmake -G 'MSYS Makefiles' -B ../nCine-build-Release -D CMAKE_BUILD_TYPE=Release -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=$env:IMGUI_VERSION_TAG -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"
110111
C:\msys64\usr\bin\bash.exe -lc 'make -j $NUMBER_OF_PROCESSORS -C ../nCine-build-Release'
111112
}
112113
else
113114
{
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.92.1-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 "cmake -G 'MSYS Makefiles' -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=$env:IMGUI_VERSION_TAG -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"
115116
C:\msys64\usr\bin\bash.exe -lc 'make -j $NUMBER_OF_PROCESSORS -C ../nCine-build-${{ matrix.BuildType }}'
116117
}
117118

‎.github/workflows/windows.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
99
- PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}"
1010
DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
11+
IMGUI_VERSION_TAG: v1.92.4-docking
1112

1213
on: [push, workflow_dispatch]
1314

@@ -67,7 +68,7 @@ jobs:
6768
else
6869
{ $nCineBuildType = "${{ matrix.BuildType }}" }
6970
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.92.1-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
71+
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=$env:IMGUI_VERSION_TAG -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
7172
7273
cd ..
7374
cmake --build nCine-build-$nCineBuildType --config $nCineBuildType -j $env:NUMBER_OF_PROCESSORS

0 commit comments

Comments
 (0)