Skip to content

Commit 2ab6c58

Browse files
StableCoderStableCoder
committed
Update CI jobs
Change CMake calls for better option clarity, and sanitizer builds from release to debug builds for clearer errors.
1 parent 95693ad commit 2ab6c58

File tree

1 file changed

+37
-37
lines changed

1 file changed

+37
-37
lines changed

‎.gitlab-ci.yml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Linux/Targeted CC GCC Static:
6060
CC: gcc
6161
CXX: g++
6262
script:
63-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
63+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
6464
- ninja -C build
6565
- ninja -C build ccov
6666

@@ -77,9 +77,9 @@ Linux/Targeted CC GCC Shared:
7777
variables:
7878
CC: gcc
7979
CXX: g++
80-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
80+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
8181
script:
82-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
82+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
8383
- ninja -C build
8484
- ninja -C build ccov
8585

@@ -97,7 +97,7 @@ Linux/Targeted CC Clang Static:
9797
CC: clang
9898
CXX: clang++
9999
script:
100-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
100+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
101101
- ninja -C build
102102
- ninja -C build ccov
103103
- ninja -C build ccov-report
@@ -115,9 +115,9 @@ Linux/Targeted CC Clang Shared:
115115
variables:
116116
CC: clang
117117
CXX: clang++
118-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
118+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
119119
script:
120-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
120+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
121121
- ninja -C build
122122
- ninja -C build ccov
123123
- ninja -C build ccov-report
@@ -131,7 +131,7 @@ macOS/Targeted CC AppleClang Static:
131131
- macos
132132
- ${ARCH}
133133
script:
134-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
134+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
135135
- ninja -C build
136136
- ninja -C build ccov
137137
- ninja -C build ccov-report
@@ -145,9 +145,9 @@ macOS/Targeted CC AppleClang Shared:
145145
- macos
146146
- ${ARCH}
147147
variables:
148-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
148+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
149149
script:
150-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
150+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
151151
- ninja -C build
152152
- ninja -C build ccov
153153
- ninja -C build ccov-report
@@ -164,7 +164,7 @@ macOS/Targeted CC Clang Static:
164164
CC: clang
165165
CXX: clang++
166166
script:
167-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
167+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
168168
- ninja -C build
169169
- ninja -C build ccov
170170
- ninja -C build ccov-report
@@ -180,9 +180,9 @@ macOS/Targeted CC Clang Shared:
180180
variables:
181181
CC: clang
182182
CXX: clang++
183-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
183+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
184184
script:
185-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
185+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
186186
- ninja -C build
187187
- ninja -C build ccov
188188
- ninja -C build ccov-report
@@ -202,7 +202,7 @@ Windows/Targeted CC Clang Static:
202202
CC: clang
203203
CXX: clang++
204204
script:
205-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
205+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
206206
- ninja -C build
207207
- ninja -C build ccov
208208
- ninja -C build ccov-report
@@ -221,9 +221,9 @@ Windows/Targeted CC Clang Shared:
221221
variables:
222222
CC: clang
223223
CXX: clang++
224-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
224+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
225225
script:
226-
- cmake example/code-coverage-target/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
226+
- cmake -S example/code-coverage-target/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
227227
- ninja -C build
228228
- ninja -C build ccov
229229
- ninja -C build ccov-report
@@ -244,7 +244,7 @@ Linux/All CC GCC Static:
244244
CC: gcc
245245
CXX: g++
246246
script:
247-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
247+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
248248
- ninja -C build
249249
- ninja -C build ccov
250250
- ninja -C build ccov-all
@@ -262,9 +262,9 @@ Linux/All CC GCC Shared:
262262
variables:
263263
CC: gcc
264264
CXX: g++
265-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
265+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
266266
script:
267-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
267+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
268268
- ninja -C build
269269
- ninja -C build ccov
270270
- ninja -C build ccov-all
@@ -283,7 +283,7 @@ Linux/All CC Clang Static:
283283
CC: clang
284284
CXX: clang++
285285
script:
286-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
286+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
287287
- ninja -C build
288288
- ninja -C build ccov-all
289289
- ninja -C build ccov-report
@@ -302,9 +302,9 @@ Linux/All CC Clang Shared:
302302
variables:
303303
CC: clang
304304
CXX: clang++
305-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
305+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
306306
script:
307-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
307+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
308308
- ninja -C build
309309
- ninja -C build ccov
310310
- ninja -C build ccov-all
@@ -320,7 +320,7 @@ macOS/All CC AppleClang Static:
320320
- macos
321321
- ${ARCH}
322322
script:
323-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
323+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
324324
- ninja -C build
325325
- ninja -C build ccov-all
326326
- ninja -C build ccov-report
@@ -335,9 +335,9 @@ macOS/All CC AppleClang Shared:
335335
- macos
336336
- ${ARCH}
337337
variables:
338-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
338+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
339339
script:
340-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
340+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
341341
- ninja -C build
342342
- ninja -C build ccov
343343
- ninja -C build ccov-all
@@ -356,7 +356,7 @@ macOS/All CC Clang Static:
356356
CC: clang
357357
CXX: clang++
358358
script:
359-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
359+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
360360
- ninja -C build
361361
- ninja -C build ccov-all
362362
- ninja -C build ccov-report
@@ -373,9 +373,9 @@ macOS/All CC Clang Shared:
373373
variables:
374374
CC: clang
375375
CXX: clang++
376-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
376+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
377377
script:
378-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
378+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
379379
- ninja -C build
380380
- ninja -C build ccov
381381
- ninja -C build ccov-all
@@ -397,7 +397,7 @@ Windows/All CC Clang Static:
397397
CC: clang
398398
CXX: clang++
399399
script:
400-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
400+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
401401
- ninja -C build
402402
- ninja -C build ccov
403403
- ninja -C build ccov-all
@@ -418,9 +418,9 @@ Windows/All CC Clang Shared:
418418
variables:
419419
CC: clang
420420
CXX: clang++
421-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON
421+
CMAKE_OPTIONS: -D BUILD_SHARED_LIBS=ON
422422
script:
423-
- cmake example/code-coverage-all/ -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=ON ${CMAKE_OPTIONS}
423+
- cmake -S example/code-coverage-all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CODE_COVERAGE=ON ${CMAKE_OPTIONS}
424424
- ninja -C build
425425
- ninja -C build ccov
426426
- ninja -C build ccov-all
@@ -440,7 +440,7 @@ Windows/All CC Clang Shared:
440440
- linux
441441
- ${ARCH}
442442
script:
443-
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
443+
- cmake -S example/all -B build -G Ninja -D CMAKE_BUILD_TYPE=Debug ${CMAKE_OPTIONS}
444444
- ninja -C build
445445
- ctest --test-dir build --output-on-failure ${CTEST_OPTIONS}
446446

@@ -455,15 +455,15 @@ Windows/All CC Clang Shared:
455455
- linux
456456
- ${ARCH}
457457
script:
458-
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
458+
- cmake -S example/all -B build -G Ninja -D CMAKE_BUILD_TYPE=Debug ${CMAKE_OPTIONS}
459459
- ninja -C build
460460
- "! ctest --test-dir build --output-on-failure ${CTEST_OPTIONS}"
461461

462462
Linux/Static Analysis:
463463
variables:
464464
CC: clang
465465
CXX: clang++
466-
CMAKE_OPTIONS: -DCLANG_TIDY=ON -DCPPCHECK=ON
466+
CMAKE_OPTIONS: -D CLANG_TIDY=ON -D CPPCHECK=ON
467467
<<: *linux_success_template
468468

469469
Linux/GCC/ThreadSanitizer:
@@ -532,7 +532,7 @@ Linux/Clang/UndefinedSanitizer:
532532
- macos
533533
- ${ARCH}
534534
script:
535-
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
535+
- cmake -S example/all -B build -G Ninja -D CMAKE_BUILD_TYPE=Debug ${CMAKE_OPTIONS}
536536
- ninja -C build
537537
- ctest --test-dir build --output-on-failure ${CTEST_OPTIONS}
538538

@@ -545,7 +545,7 @@ Linux/Clang/UndefinedSanitizer:
545545
- macos
546546
- ${ARCH}
547547
script:
548-
- cmake example/all -B build -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
548+
- cmake -S example/all -B build -G Ninja -D CMAKE_BUILD_TYPE=Debug ${CMAKE_OPTIONS}
549549
- ninja -C build
550550
- "! ctest --test-dir build --output-on-failure ${CTEST_OPTIONS}"
551551

@@ -606,7 +606,7 @@ Windows/MSVC/Address Sanitizer:
606606
- ltsc2022
607607
- ${ARCH}
608608
script:
609-
- cmake example/all/ -B build -GNinja -D EXAMPLE_USE_SANITIZER=address $env:CMAKE_OPTIONS
609+
- cmake -S example/all/ -B build -G Ninja -D CMAKE_BUILD_TYPE=Debug -D EXAMPLE_USE_SANITIZER=address $env:CMAKE_OPTIONS
610610
- ninja -C build
611611
- ctest --test-dir build --output-on-failure $env:CTEST_OPTIONS ; if ($? -ne 0) { exit 1 } else { exit 0 }
612612

@@ -681,7 +681,7 @@ Windows/MSVC/Address Sanitizer (LEGACY):
681681
- ltsc2022
682682
- ${ARCH}
683683
script:
684-
- cmake example/all/ -B build -GNinja -D USE_SANITIZER=address
684+
- cmake -S example/all/ -B build -G Ninja -D USE_SANITIZER=address
685685
- ninja -C build
686686
- ctest --test-dir build --output-on-failure $env:CTEST_OPTIONS ; if ($? -ne 0) { exit 1 } else { exit 0 }
687687

0 commit comments

Comments
 (0)