summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-16 18:56:06 (GMT)
committerBrad King <brad.king@kitware.com>2021-06-16 18:57:34 (GMT)
commit886a97cbe7da0f969549f819ba22a8f264838272 (patch)
tree2bbf196da9272e8002592e5d3c7b07b6506398df /.gitlab
parent4371a25d1fb67a185b769bac2cfb129301d9e39f (diff)
downloadCMake-886a97cbe7da0f969549f819ba22a8f264838272.zip
CMake-886a97cbe7da0f969549f819ba22a8f264838272.tar.gz
CMake-886a97cbe7da0f969549f819ba22a8f264838272.tar.bz2
gitlab-ci: add job to test with clang-7 and ninja on debian10
In commit 7e5e558d0f (gitlab-ci: add job to test with clang-7 on debian10, 2021-06-04) we added coverage of clang-7 with the Unix Makefiles generator. Do the same for Ninja.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/configure_debian10_ninja_clang.cmake1
-rw-r--r--.gitlab/ci/env_debian10_ninja_clang.sh2
-rw-r--r--.gitlab/os-linux.yml6
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 6b490be..c729aa9 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: