From 99c335c8e812d38564e214bb4984d270417b2a5c Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 17 Nov 2021 12:05:50 -0500 Subject: gitlab-ci: Clarify MSVC v71 job script config block name Rename `cmake_test_windows_{nmake => msvc}` since it fetches MSVC, not NMake. --- .gitlab-ci.yml | 2 +- .gitlab/os-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f38659..80d20dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -802,7 +802,7 @@ test:windows-borland5.8: test:windows-msvc-v71-nmake: extends: - .windows_msvc_v71_nmake - - .cmake_test_windows_nmake + - .cmake_test_windows_msvc - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 7c578aa..bf75b6e 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -212,7 +212,7 @@ interruptible: true -.cmake_test_windows_nmake: +.cmake_test_windows_msvc: stage: test-ext script: -- cgit v0.12 From bd00882f49e600d0da46aa85ebb50217e981d2dd Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 17 Nov 2021 11:56:52 -0500 Subject: gitlab-ci: Factor out windows_vcvarsall_vs2022_x64 config block Isolate the vcvarsall variables in a dedicated block. --- .gitlab/os-windows.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index bf75b6e..f2ded22 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -31,15 +31,20 @@ CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.windows_vs2022_x64_ninja: - extends: .windows_ninja - +.windows_vcvarsall_vs2022_x64: variables: - CMAKE_CONFIGURATION: windows_vs2022_x64_ninja VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" VCVARSVERSION: "14.30.30705" +.windows_vs2022_x64_ninja: + extends: + - .windows_ninja + - .windows_vcvarsall_vs2022_x64 + + variables: + CMAKE_CONFIGURATION: windows_vs2022_x64_ninja + ### External testing .windows_vs2022_x64: -- cgit v0.12 From ec68e3c5c6a232769e41234eed671cbd1e463a00 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 17 Nov 2021 12:11:13 -0500 Subject: ci: Add NMake nightly CI job --- .gitlab-ci.yml | 14 ++++++++++++++ .gitlab/ci/configure_windows_vs2022_x64_nmake.cmake | 1 + .gitlab/os-windows.yml | 17 +++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 .gitlab/ci/configure_windows_vs2022_x64_nmake.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80d20dc..ba8a204 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -771,6 +771,20 @@ test:windows-vs2019-x64: variables: CMAKE_CI_JOB_NIGHTLY: "true" +test:windows-vs2022-x64-nmake: + extends: + - .windows_vs2022_x64_nmake + - .cmake_test_windows_nmake + - .windows_tags_concurrent_vs2022 + - .cmake_junit_artifacts + - .run_dependent + dependencies: + - test:windows-vs2022-x64-ninja + needs: + - test:windows-vs2022-x64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + test:windows-borland5.5: extends: - .windows_borland5.5 diff --git a/.gitlab/ci/configure_windows_vs2022_x64_nmake.cmake b/.gitlab/ci/configure_windows_vs2022_x64_nmake.cmake new file mode 100644 index 0000000..166690a --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2022_x64_nmake.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_common.cmake") diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index f2ded22..5471683 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -95,6 +95,14 @@ CMAKE_CI_BUILD_TYPE: Release CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" +.windows_vs2022_x64_nmake: + extends: + - .windows_nmake + - .windows_vcvarsall_vs2022_x64 + + variables: + CMAKE_CONFIGURATION: windows_vs2022_x64_nmake + .windows_msvc_v71_nmake: extends: .windows_nmake @@ -206,6 +214,15 @@ interruptible: true +.cmake_test_windows_nmake: + stage: test-ext + + script: + - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + + interruptible: true + .cmake_test_windows_borland: stage: test-ext -- cgit v0.12 From 3b9975d9b5a555c03ad546cd1390da63e1e92fd0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 17 Nov 2021 12:15:52 -0500 Subject: ci: Add JOM nightly CI job --- .gitlab-ci.yml | 14 ++++++++++++ .gitlab/ci/configure_windows_vs2022_x64_jom.cmake | 1 + .gitlab/ci/jom.ps1 | 15 ++++++++++++ .gitlab/os-windows.yml | 28 +++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 .gitlab/ci/configure_windows_vs2022_x64_jom.cmake create mode 100755 .gitlab/ci/jom.ps1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba8a204..ee059dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -785,6 +785,20 @@ test:windows-vs2022-x64-nmake: variables: CMAKE_CI_JOB_NIGHTLY: "true" +test:windows-vs2022-x64-jom: + extends: + - .windows_vs2022_x64_jom + - .cmake_test_windows_jom + - .windows_tags_concurrent_vs2022 + - .cmake_junit_artifacts + - .run_dependent + dependencies: + - test:windows-vs2022-x64-ninja + needs: + - test:windows-vs2022-x64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + test:windows-borland5.5: extends: - .windows_borland5.5 diff --git a/.gitlab/ci/configure_windows_vs2022_x64_jom.cmake b/.gitlab/ci/configure_windows_vs2022_x64_jom.cmake new file mode 100644 index 0000000..166690a --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2022_x64_jom.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_common.cmake") diff --git a/.gitlab/ci/jom.ps1 b/.gitlab/ci/jom.ps1 new file mode 100755 index 0000000..6c28005 --- /dev/null +++ b/.gitlab/ci/jom.ps1 @@ -0,0 +1,15 @@ +$erroractionpreference = "stop" + +$sha256sum = "128FDD846FE24F8594EED37D1D8929A0EA78DF563537C0C1B1861A635013FFF8" +$tarball = "unstable-jom-2018-12-12.zip" + +$outdir = $pwd.Path +$outdir = "$outdir\.gitlab" +$ProgressPreference = 'SilentlyContinue' +Invoke-WebRequest -Uri "https://cmake.org/files/dependencies/$tarball" -OutFile "$outdir\$tarball" +$hash = Get-FileHash "$outdir\$tarball" -Algorithm SHA256 +if ($hash.Hash -ne $sha256sum) { + exit 1 +} + +Expand-Archive -Path "$outdir\$tarball" -DestinationPath "$outdir\jom" diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 5471683..e15bbe9 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -95,6 +95,14 @@ CMAKE_CI_BUILD_TYPE: Release CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" +.windows_jom: + extends: .windows + + variables: + CMAKE_GENERATOR: "NMake Makefiles JOM" + CMAKE_CI_BUILD_TYPE: Release + CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" + .windows_vs2022_x64_nmake: extends: - .windows_nmake @@ -103,6 +111,14 @@ variables: CMAKE_CONFIGURATION: windows_vs2022_x64_nmake +.windows_vs2022_x64_jom: + extends: + - .windows_jom + - .windows_vcvarsall_vs2022_x64 + + variables: + CMAKE_CONFIGURATION: windows_vs2022_x64_jom + .windows_msvc_v71_nmake: extends: .windows_nmake @@ -223,6 +239,18 @@ interruptible: true +.cmake_test_windows_jom: + stage: test-ext + + script: + - Invoke-Expression -Command .gitlab/ci/jom.ps1 + - $pwdpath = $pwd.Path + - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\jom;$env:PATH" + - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + + interruptible: true + .cmake_test_windows_borland: stage: test-ext -- cgit v0.12