diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-07 17:19:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-07 17:19:48 (GMT) |
| commit | 684685b25fbef9b37a2c1b5e6f89979207cf9f21 (patch) | |
| tree | 2cc5253e84cf037950b4320f8a62044467173398 | |
| parent | 4ee2fc28a66930836cbd1493cdf420a477b500e9 (diff) | |
| parent | 7e5e558d0f7cd0e5ac579322c13142d1fac93f0a (diff) | |
| download | CMake-684685b25fbef9b37a2c1b5e6f89979207cf9f21.zip CMake-684685b25fbef9b37a2c1b5e6f89979207cf9f21.tar.gz CMake-684685b25fbef9b37a2c1b5e6f89979207cf9f21.tar.bz2 | |
Merge topic 'ci-clang'
7e5e558d0f gitlab-ci: add job to test with clang-7 on debian10
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6194
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab/ci/configure_debian10_makefiles_clang.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/env_debian10_makefiles_clang.sh | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 9 |
4 files changed, 22 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf00222..236eac9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,6 +176,16 @@ test:debian10-aarch64-ninja: variables: CMAKE_CI_NO_MR: "true" +test:debian10-makefiles-clang: + extends: + - .debian10_makefiles_clang + - .cmake_test_linux_release + - .linux_builder_tags_qt + - .run_manually + - .needs_centos6_x86_64 + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + test:fedora34-makefiles: extends: - .fedora34_makefiles diff --git a/.gitlab/ci/configure_debian10_makefiles_clang.cmake b/.gitlab/ci/configure_debian10_makefiles_clang.cmake new file mode 100644 index 0000000..20863a2 --- /dev/null +++ b/.gitlab/ci/configure_debian10_makefiles_clang.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_debian10_makefiles_clang.sh b/.gitlab/ci/env_debian10_makefiles_clang.sh new file mode 100644 index 0000000..e0d5d61 --- /dev/null +++ b/.gitlab/ci/env_debian10_makefiles_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 a8c07d8..015df4f 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -149,6 +149,15 @@ CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" +### Clang Compiler + +.debian10_makefiles_clang: + extends: .debian10 + + variables: + CMAKE_CONFIGURATION: debian10_makefiles_clang + CMAKE_GENERATOR: "Unix Makefiles" + ### Intel Compiler .intelcompiler: |