diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-21 13:17:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-21 13:17:08 (GMT) |
| commit | b69441c796827f28742e2b0a4a611c55c7d0ce45 (patch) | |
| tree | 6c7076fc343dc148b09c06c9f2bbb91e02f1eda7 | |
| parent | effed24df8e5142f2b4bc4b64fb40f57a8686939 (diff) | |
| parent | be1549d95026bc3e58b8f96f8fd46366027631ce (diff) | |
| download | CMake-b69441c796827f28742e2b0a4a611c55c7d0ce45.zip CMake-b69441c796827f28742e2b0a4a611c55c7d0ce45.tar.gz CMake-b69441c796827f28742e2b0a4a611c55c7d0ce45.tar.bz2 | |
Merge topic 'ci-clang16-windows'
be1549d950 ci: Enable C++ modules tests with LLVM/Clang 16.0 on Windows
eb93e1ff18 ci: Update LLVM/Clang to 16.0 in nightly CI jobs on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8350
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rwxr-xr-x | .gitlab/ci/clang.ps1 | 10 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_clang_ninja.cmake | 4 |
3 files changed, 17 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 829e34f..2c81b37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1104,7 +1104,7 @@ t:windows-borland5.8: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang15.0-cl-ninja: +t:windows-clang16.0-cl-ninja: extends: - .windows_clang_ninja - .cmake_test_windows_external @@ -1116,10 +1116,10 @@ t:windows-clang15.0-cl-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_ninja + CMAKE_CI_BUILD_NAME: windows_clang16.0_cl_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang15.0-cl-nmake: +t:windows-clang16.0-cl-nmake: extends: - .windows_clang_nmake - .cmake_test_windows_external @@ -1131,10 +1131,10 @@ t:windows-clang15.0-cl-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_nmake + CMAKE_CI_BUILD_NAME: windows_clang16.0_cl_nmake CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang15.0-gnu-ninja: +t:windows-clang16.0-gnu-ninja: extends: - .windows_clang_ninja - .cmake_test_windows_external @@ -1146,10 +1146,10 @@ t:windows-clang15.0-gnu-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_ninja + CMAKE_CI_BUILD_NAME: windows_clang16.0_gnu_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang15.0-gnu-nmake: +t:windows-clang16.0-gnu-nmake: extends: - .windows_clang_nmake - .cmake_test_windows_external @@ -1161,7 +1161,7 @@ t:windows-clang15.0-gnu-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_nmake + CMAKE_CI_BUILD_NAME: windows_clang16.0_gnu_nmake CMAKE_CI_JOB_NIGHTLY: "true" t:mingw_osdn_io-mingw_makefiles: diff --git a/.gitlab/ci/clang.ps1 b/.gitlab/ci/clang.ps1 index 29db93d..1fc8d8e 100755 --- a/.gitlab/ci/clang.ps1 +++ b/.gitlab/ci/clang.ps1 @@ -1,10 +1,10 @@ $erroractionpreference = "stop" -if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang15.0")) { - # LLVM/Clang 15.0 - # https://github.com/llvm/llvm-project/releases/tag/llvmorg-15.0.4 - $filename = "llvm-15.0.4-win-x86_64-1" - $sha256sum = "9AA305084C20C27972E103E7B18AAC3F755E0534542AF62FC2F2BF5DDD3C4E1F" +if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang16.0")) { + # LLVM/Clang 16.0 + # https://github.com/llvm/llvm-project/releases/tag/llvmorg-16.0.0 + $filename = "llvm-16.0.0-win-x86_64-1" + $sha256sum = "13F48356BA5892A82E8BB25EB283FDDAA8F23A0F209B6BF6525D2C5E1285B950" } else { throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME") } diff --git a/.gitlab/ci/configure_windows_clang_ninja.cmake b/.gitlab/ci/configure_windows_clang_ninja.cmake index ba19834..a66e302 100644 --- a/.gitlab/ci/configure_windows_clang_ninja.cmake +++ b/.gitlab/ci/configure_windows_clang_ninja.cmake @@ -1 +1,5 @@ +if("$ENV{CMAKE_CI_BUILD_NAME}" MATCHES "(^|_)gnu(_|$)") + set(CMake_TEST_MODULE_COMPILATION "named,partitions,internal_partitions,export_bmi,install_bmi,shared" CACHE STRING "") + set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") +endif() include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_common.cmake") |