From 3eb94e4d51b5f5f66518bdcaef09a75dd2305606 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Nov 2022 09:33:45 -0500 Subject: ci: Simplify LLVM/Clang CI job specs on Windows Move environment setup to job-specific scripts so we can reuse the common `.cmake_test_windows_external` code path. --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e5824d728..ca1437befb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1003,7 +1003,7 @@ t:windows-borland5.8: t:windows-clang13.0-cl-ninja: extends: - .windows_clang_ninja - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent @@ -1018,7 +1018,7 @@ t:windows-clang13.0-cl-ninja: t:windows-clang13.0-cl-nmake: extends: - .windows_clang_nmake - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent @@ -1033,7 +1033,7 @@ t:windows-clang13.0-cl-nmake: t:windows-clang13.0-gnu-ninja: extends: - .windows_clang_ninja - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent @@ -1048,7 +1048,7 @@ t:windows-clang13.0-gnu-ninja: t:windows-clang13.0-gnu-nmake: extends: - .windows_clang_nmake - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent -- cgit v1.2.1 From 46b2849550821353f1eb513527c1f47dc761cc68 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Nov 2022 09:36:27 -0500 Subject: ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca1437befb..d4baba5486 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1000,7 +1000,7 @@ t:windows-borland5.8: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-cl-ninja: +t:windows-clang15.0-cl-ninja: extends: - .windows_clang_ninja - .cmake_test_windows_external @@ -1012,10 +1012,10 @@ t:windows-clang13.0-cl-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_cl_ninja + CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-cl-nmake: +t:windows-clang15.0-cl-nmake: extends: - .windows_clang_nmake - .cmake_test_windows_external @@ -1027,10 +1027,10 @@ t:windows-clang13.0-cl-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_cl_nmake + CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_nmake CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-gnu-ninja: +t:windows-clang15.0-gnu-ninja: extends: - .windows_clang_ninja - .cmake_test_windows_external @@ -1042,10 +1042,10 @@ t:windows-clang13.0-gnu-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_gnu_ninja + CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-gnu-nmake: +t:windows-clang15.0-gnu-nmake: extends: - .windows_clang_nmake - .cmake_test_windows_external @@ -1057,7 +1057,7 @@ t:windows-clang13.0-gnu-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_gnu_nmake + CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_nmake CMAKE_CI_JOB_NIGHTLY: "true" t:windows-msvc-v71-nmake: -- cgit v1.2.1