diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-17 10:36:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-17 10:36:32 (GMT) |
| commit | 54860f1f6b04a30273a33ee1adbac7e204477aff (patch) | |
| tree | f7e1d6a4d2ad1fafd81dfe82a248621779da0a7a /.gitlab | |
| parent | 4941bf5995e297dd99e5187b974bdcbf9f423dc8 (diff) | |
| parent | 886a97cbe7da0f969549f819ba22a8f264838272 (diff) | |
| download | CMake-54860f1f6b04a30273a33ee1adbac7e204477aff.zip CMake-54860f1f6b04a30273a33ee1adbac7e204477aff.tar.gz CMake-54860f1f6b04a30273a33ee1adbac7e204477aff.tar.bz2 | |
Merge topic 'ci-clang'
886a97cbe7 gitlab-ci: add job to test with clang-7 and ninja on debian10
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6237
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_debian10_ninja_clang.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/env_debian10_ninja_clang.sh | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_debian10_ninja_clang.cmake b/.gitlab/ci/configure_debian10_ninja_clang.cmake new file mode 100644 index 0000000..20863a2 --- /dev/null +++ b/.gitlab/ci/configure_debian10_ninja_clang.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_debian10_ninja_clang.sh b/.gitlab/ci/env_debian10_ninja_clang.sh new file mode 100644 index 0000000..e0d5d61 --- /dev/null +++ b/.gitlab/ci/env_debian10_ninja_clang.sh @@ -0,0 +1,2 @@ +export CC=/usr/bin/clang-7 +export CXX=/usr/bin/clang++-7 diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 67e9ce5..06b98cc 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -158,6 +158,12 @@ CMAKE_CONFIGURATION: debian10_makefiles_clang CMAKE_GENERATOR: "Unix Makefiles" +.debian10_ninja_clang: + extends: .debian10 + + variables: + CMAKE_CONFIGURATION: debian10_ninja_clang + ### Sanitizers .fedora_memcheck: |