Skip to content

Commit 5572535

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents 21605ff + dfd1ada commit 5572535

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ build-linux:
99
stage: build
1010
parallel:
1111
matrix:
12-
- COMPILER: [gcc-11, gcc-12, gcc-13, clang-11.0.1, clang-12, clang-13, clang-14, clang-15, clang-16, clang-17]
12+
- COMPILER: [gcc-11, gcc-12, gcc-13, gcc-14, gcc-15, clang-11.0.1, clang-12, clang-13, clang-14, clang-15, clang-16, clang-17, clang-18, clang-19, clang-20, clang-21]
1313
TYPE: [exe, static, shared]
1414
image: $CI_REGISTRY/idi/dockerfiles/cmake-cpp:$COMPILER
1515
rules:
16-
- if: $CI_PIPELINE_SOURCE != "merge_request_event" && (($COMPILER =~ /(gcc-14|clang-14)$/)) # clang-14 image has a bug with libc++13
16+
- if: $CI_PIPELINE_SOURCE != "merge_request_event" && (($COMPILER =~ /(gcc-16|clang-14|clang-21)$/)) # clang-14 image has a bug with libc++13
1717
allow_failure: true
1818
- if: $CI_PIPELINE_SOURCE != "merge_request_event" # Only on push events (same as 'except: merge_requests')
1919
before_script: # This is required for pulling dependencies on projects
@@ -24,7 +24,7 @@ build-linux:
2424
- mkdir -p build && cd build
2525
- cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
2626
- cmake --build . -j 8
27-
- ctest -C Debug --output-junit ctest.xml
27+
- ctest -C Debug --output-on-failure --output-junit ctest.xml
2828
interruptible: true
2929
artifacts:
3030
when: always
@@ -52,7 +52,7 @@ build-windows:
5252
- cd build
5353
- cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG="../platform-config.$TYPE.cmake"
5454
- cmake --build . -j 8
55-
- ctest -C Debug --output-junit ctest.xml
55+
- ctest -C Debug --output-on-failure --output-junit ctest.xml
5656
interruptible: true
5757
artifacts:
5858
when: always

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ Enable coverage by passing `-DCODE_COVERAGE=ON` at configure time:
113113
```sh
114114
$ cd build
115115
$ cmake .. -DCODE_COVERAGE=ON
116-
$ cmake --build .
117116
```
118117

119118
Then run one of the coverage build targets:

0 commit comments

Comments
 (0)