Skip to content

Commit 1c1e6c4

Browse files
author
Vano
committed
verbose output, Ninja Multi-Config builds
1 parent cbf826b commit 1c1e6c4

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

.github/workflows/ci.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ jobs:
4444
4545
- name: CMake
4646
generate_sources: |
47-
cmake {0} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -B build test
47+
cmake {0} -DCMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -B build test
4848
4949
build_godot_cpp_debug: |
50-
cmake --build build --config Debug --target godot-cpp
50+
cmake --build build --config Debug --target godot-cpp -v
5151
5252
build_debug: |
53-
cmake --build build --config Debug
53+
cmake --build build --config Debug -v
5454
5555
build_release: |
56-
cmake {0} -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DTARGET=TEMPLATE_RELEASE -B build_release test
57-
cmake --build build_release --config Release
56+
cmake {0} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DTARGET=TEMPLATE_RELEASE -B build_release test
57+
cmake --build build_release --config Release -v
5858
5959
platforms:
6060
- name: 🐧 Linux
@@ -64,10 +64,10 @@ jobs:
6464
artifact-name: godot-cpp-linux-glibc2.27-x86_64-release
6565
artifact-path:
6666
SCons: bin/libgodot-cpp.linux.template_release.x86_64.a
67-
CMake: build_release/godot-cpp/bin/libgodot-cpp.linux.template_release.x86_64.a
67+
CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.linux.template_release.x86_64.a
6868
flags:
6969
SCons: platform=linux
70-
CMake: -G Ninja
70+
CMake: -G "Ninja Multi-Config"
7171
run-tests: true
7272
cache-name: linux-x86_64
7373

@@ -78,10 +78,10 @@ jobs:
7878
artifact-name: godot-cpp-linux-glibc2.27-x86_64-double-release
7979
artifact-path:
8080
SCons: bin/libgodot-cpp.linux.template_release.double.x86_64.a
81-
CMake: build_release/godot-cpp/bin/libgodot-cpp.linux.template_release.double.x86_64.a
81+
CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.linux.template_release.double.x86_64.a
8282
flags:
8383
SCons: platform=linux precision=double
84-
CMake: -G Ninja -DFLOAT_PRECISION=DOUBLE
84+
CMake: -G "Ninja Multi-Config" -DFLOAT_PRECISION=DOUBLE
8585
run-tests: false
8686
cache-name: linux-x86_64-f64
8787

@@ -106,10 +106,10 @@ jobs:
106106
artifact-name: godot-cpp-linux-mingw-x86_64-release
107107
artifact-path:
108108
SCons: bin/libgodot-cpp.windows.template_release.x86_64.a
109-
CMake: build_release/godot-cpp/bin/libgodot-cpp.windows.template_release.x86_64.a
109+
CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.windows.template_release.x86_64.a
110110
flags:
111111
SCons: platform=windows use_mingw=yes
112-
CMake: -G Ninja
112+
CMake: -G "Ninja Multi-Config"
113113
use-mingw: true
114114
run-tests: false
115115
cache-name: windows-x86_64-mingw
@@ -135,10 +135,10 @@ jobs:
135135
artifact-name: godot-cpp-android-arm64-release
136136
artifact-path:
137137
SCons: bin/libgodot-cpp.android.template_release.arm64.a
138-
CMake: build_release/godot-cpp/bin/libgodot-cpp.android.template_release.arm64.a
138+
CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.android.template_release.arm64.a
139139
flags:
140140
SCons: platform=android arch=arm64
141-
CMake: --toolchain ${ANDROID_HOME}/ndk/23.2.8568313/build/cmake/android.toolchain.cmake -G Ninja -DANDROID_PLATFORM=21
141+
CMake: --toolchain ${ANDROID_HOME}/ndk/23.2.8568313/build/cmake/android.toolchain.cmake -G "Ninja Multi-Config" -DANDROID_PLATFORM=21
142142
run-tests: false
143143
cache-name: android-arm64
144144

@@ -149,7 +149,7 @@ jobs:
149149
artifact-name: godot-cpp-ios-arm64-release
150150
artifact-path:
151151
SCons: bin/libgodot-cpp.ios.template_release.arm64.a
152-
CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.ios.template_release.a
152+
CMake: build_release/godot-cpp/bin/Release/Release/libgodot-cpp.ios.template_release.a
153153
flags:
154154
SCons: platform=ios arch=arm64
155155
CMake: -G Xcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
@@ -163,10 +163,10 @@ jobs:
163163
artifact-name: godot-cpp-web-wasm32-release
164164
artifact-path:
165165
SCons: bin/libgodot-cpp.web.template_release.wasm32.a
166-
CMake: build_release/godot-cpp/bin/libgodot-cpp.web.template_release.wasm32.a
166+
CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.web.template_release.wasm32.a
167167
flags:
168168
SCons: platform=web
169-
CMake: --toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -G Ninja
169+
CMake: --toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -G "Ninja Multi-Config"
170170
run-tests: false
171171
cache-name: web-wasm32
172172

0 commit comments

Comments
 (0)