Skip to content

Commit a5e3b72

Browse files
committed
ci: fix ci again
1 parent 02f5d1a commit a5e3b72

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,12 @@ jobs:
6666
CC: gcc-14
6767
CXX: g++-14
6868
run: |
69-
cmake --preset conan-default
70-
cmake --build --preset conan-default --target ${{ env.APP_NAME }} -j$(nproc)
69+
PRESET=conan-release
70+
if cmake --list-presets=configure 2>/dev/null | grep -q '"conan-default"'; then
71+
PRESET=conan-default
72+
fi
73+
cmake --preset "$PRESET"
74+
cmake --build --preset "$PRESET" --target ${{ env.APP_NAME }} -j$(nproc)
7175
7276
- name: Package AppImage
7377
if: inputs.package
@@ -154,8 +158,10 @@ jobs:
154158
shell: cmd
155159
run: |
156160
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do call "%%i\VC\Auxiliary\Build\vcvars64.bat"
157-
cmake --preset conan-default
158-
cmake --build --preset conan-default --target ${{ env.APP_NAME }}
161+
cmake --list-presets=configure 2>nul | find "conan-default" >nul
162+
if %errorlevel% equ 0 (set PRESET=conan-default) else (set PRESET=conan-release)
163+
cmake --preset %PRESET%
164+
cmake --build --preset %PRESET% --target ${{ env.APP_NAME }}
159165
160166
- name: Locate exe
161167
if: inputs.package
@@ -204,8 +210,12 @@ jobs:
204210

205211
- name: Build
206212
run: |
207-
cmake --preset conan-default
208-
cmake --build --preset conan-default --target ${{ env.APP_NAME }} -j$(nproc)
213+
PRESET=conan-release
214+
if cmake --list-presets=configure 2>/dev/null | grep -q '"conan-default"'; then
215+
PRESET=conan-default
216+
fi
217+
cmake --preset "$PRESET"
218+
cmake --build --preset "$PRESET" --target ${{ env.APP_NAME }} -j$(nproc)
209219
210220
- name: Package
211221
if: inputs.package

0 commit comments

Comments
 (0)