diff options
author | Brad King <brad.king@kitware.com> | 2023-05-22 17:41:30 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2023-05-22 21:16:13 (GMT) |
commit | 1689e0a118f37f62d198a213946d98624350cb4c (patch) | |
tree | b09e6903f0986a0bca8d451b93b3005e3ab7ce16 /.gitlab-ci.yml | |
parent | bdaa9e1e4ec626a9acc818553424e414c57633dd (diff) | |
download | CMake-1689e0a118f37f62d198a213946d98624350cb4c.zip CMake-1689e0a118f37f62d198a213946d98624350cb4c.tar.gz CMake-1689e0a118f37f62d198a213946d98624350cb4c.tar.bz2 |
ci: Subsume Clang C++ modules testing in main Fedora+Clang jobs
Fedora 38 comes with LLVM/Clang 16.0, which supports the features we
need for C++ modules.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74c8104..6e0d01a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,6 +205,16 @@ t:fedora38-ninja-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" +t:fedora38-ninja-multi-clang: + extends: + - .fedora38_ninja_multi_clang + - .cmake_test_linux_release + - .linux_x86_64_tags + - .run_dependent + - .needs_centos6_x86_64 + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + t:fedora38-makefiles-clang: extends: - .fedora38_makefiles_clang @@ -334,26 +344,6 @@ t:linux-gcc-cxx-modules-ninja-multi: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:linux-clang-cxx-modules-ninja: - extends: - - .clang_cxx_modules_ninja - - .cmake_test_linux_release - - .linux_x86_64_tags - - .run_dependent - - .needs_centos6_x86_64 - variables: - CMAKE_CI_JOB_NIGHTLY: "true" - -t:linux-clang-cxx-modules-ninja-multi: - extends: - - .clang_cxx_modules_ninja_multi - - .cmake_test_linux_release - - .linux_x86_64_tags - - .run_dependent - - .needs_centos6_x86_64 - variables: - CMAKE_CI_JOB_NIGHTLY: "true" - b:fedora38-ninja: extends: - .fedora38_ninja |