Skip to content

Commit 2411f83

Browse files
committed
fix ci
1 parent e30d3e4 commit 2411f83

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.github/workflows/build.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ jobs:
2828
- name: Prepare cmake
2929
uses: lukka/get-cmake@latest
3030

31+
- name: Install Qt
32+
uses: jurplel/install-qt-action@v4
33+
with:
34+
#dir: # optional
35+
version: 6.9.0
36+
target: desktop
37+
3138
- name: Prepare Ubuntu
3239
if: contains(matrix.os, 'ubuntu') && matrix.android == 'none'
3340
run: |
@@ -43,13 +50,14 @@ jobs:
4350
if: ${{ !contains(matrix.os, 'windows') && matrix.android == 'none' }}
4451
working-directory: ./engine
4552
run: |
46-
${{ matrix.cmake-path }}cmake --preset=CI-Linux
53+
${{ matrix.cmake-path }}cmake -S . -B cmake-build -DNICKEL_BUILD_TESTS=ON -DNICKEL_BUILD_TOOLS=ON -DQT6_PATH=$QT_ROOT_DIR
4754
4855
- name: Config cmake(Windows)
4956
if: contains(matrix.os, 'windows')
5057
working-directory: ./engine
5158
run: |
52-
${{ matrix.cmake-path}}cmake --preset=CI-Windows
59+
${{ matrix.cmake-path }}cmake -S . -B cmake-build -DNICKEL_BUILD_TESTS=ON -DNICKEL_BUILD_TOOLS=ON -DCMAKE_SYSTEM_VERSION="10.0.26100.0" -DQT6_PATH=$env:QT_ROOT_DIR
60+
5361
5462
- name: Build under PC
5563
if: matrix.android == 'none'

engine/CMakePresets.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@
99
"NICKEL_BUILD_TESTS" : "ON",
1010
"NICKEL_BUILD_TOOLS" : "ON"
1111
}
12-
},
13-
{
14-
"name": "CI-Linux",
15-
"binaryDir": "${sourceDir}/cmake-build",
16-
"generator": "Ninja",
17-
"cacheVariables": {
18-
"NICKEL_BUILD_TESTS" : "ON",
19-
"NICKEL_BUILD_TOOLS" : "ON"
20-
}
21-
},
22-
{
23-
"name": "CI-Windows",
24-
"binaryDir": "${sourceDir}/cmake-build",
25-
"cacheVariables": {
26-
"NICKEL_BUILD_TESTS" : "ON",
27-
"NICKEL_BUILD_TOOLS" : "ON",
28-
"CMAKE_SYSTEM_VERSION" : "10.0.26100.0"
29-
}
3012
}
3113
]
3214
}

0 commit comments

Comments
 (0)