Skip to content

Commit b0e1cd1

Browse files
committed
fix GHA build issues
1 parent 74b75bd commit b0e1cd1

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,34 @@ jobs:
1717
fail-fast: false
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
submodules: recursive
2323

2424
- name: Update CMake
2525
uses: jwlawson/actions-setup-cmake@v1.13
2626

27-
- uses: actions/setup-python@v4
27+
- uses: actions/setup-python@v5
2828
name: Install Python
2929
with:
30-
python-version: '3.9'
31-
32-
- name: Prepare compiler environment for Windows
33-
if: runner.os == 'Windows'
34-
uses: ilammy/msvc-dev-cmd@v1
35-
with:
36-
arch: x64
30+
python-version: '3.12'
3731

3832
- name: Install dependencies on Linux
3933
if: runner.os == 'Linux'
40-
run: sudo apt-get install -y xorg-dev libglu1-mesa-dev
34+
run: sudo apt-get install -y xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev libdbus-1-dev
4135

42-
- name: Configure
43-
run: >
44-
cmake -S . -B build "-DPython_EXECUTABLE=$(python3 -c 'import sys; print(sys.executable)')"
36+
- name: Configure (Windows)
37+
if: runner.os == 'Windows'
38+
run: |
39+
cmake -S . -B build -G "Visual Studio 17 2022" `
40+
"-DPython_EXECUTABLE=$(python -c 'import sys; print(sys.executable)')" `
41+
-DCMAKE_VERBOSE_MAKEFILE=ON
42+
43+
- name: Configure (Linux)
44+
if: runner.os == 'Linux'
45+
run: |
46+
cmake -S . -B build \
47+
"-DPython_EXECUTABLE=$(python3 -c 'import sys; print(sys.executable)')"
4548
4649
- name: Build C++
47-
run: cmake --build build -j 2
50+
run: cmake --build build -j 2 --config Release

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ endif()
172172

173173
# Use C++17, visibility=hidden by default, interprocedural optimization
174174
set(CMAKE_CXX_STANDARD 17)
175+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
175176
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
176177

177178
# Prefer libc++ in conjunction with Clang

0 commit comments

Comments
 (0)