diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-06 13:47:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-06 13:47:50 (GMT) |
| commit | 058253aa87e23f1ec6fd6f0a06262fa24a3e8d2c (patch) | |
| tree | 1766688d626e0b0ce160c39d3843ced3e09b4849 /.gitlab/os-linux.yml | |
| parent | a27fa90aa1bc88a1633c51a8e6951373d6c62499 (diff) | |
| parent | 46c89c77de3216088afe11ffba33321b2cbb81e2 (diff) | |
| download | CMake-058253aa87e23f1ec6fd6f0a06262fa24a3e8d2c.zip CMake-058253aa87e23f1ec6fd6f0a06262fa24a3e8d2c.tar.gz CMake-058253aa87e23f1ec6fd6f0a06262fa24a3e8d2c.tar.bz2 | |
Merge topic 'ci-fixups'
46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE
3ede66e17a Tests: Fix newline matching in several RunCMake.* cases
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6298
Diffstat (limited to '.gitlab/os-linux.yml')
| -rw-r--r-- | .gitlab/os-linux.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index cd1195b..65a4282 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -90,7 +90,7 @@ variables: CMAKE_CONFIGURATION: fedora34_clang_analyzer - CMAKE_BUILD_TYPE: Debug + CMAKE_CI_BUILD_TYPE: Debug CTEST_NO_WARNINGS_ALLOWED: 1 CMake_SKIP_INSTALL: 1 @@ -168,7 +168,7 @@ .fedora_memcheck: variables: - CMAKE_BUILD_TYPE: RelWithDebInfo + CMAKE_CI_BUILD_TYPE: RelWithDebInfo .fedora_asan_addon: extends: .fedora_memcheck |