summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-17 17:11:13 (GMT)
committerBrad King <brad.king@kitware.com>2021-11-17 17:49:43 (GMT)
commitec68e3c5c6a232769e41234eed671cbd1e463a00 (patch)
treea4e0d87c07a2c4b445b988a481e3ca75c562cbfc
parentbd00882f49e600d0da46aa85ebb50217e981d2dd (diff)
downloadCMake-ec68e3c5c6a232769e41234eed671cbd1e463a00.zip
CMake-ec68e3c5c6a232769e41234eed671cbd1e463a00.tar.gz
CMake-ec68e3c5c6a232769e41234eed671cbd1e463a00.tar.bz2
ci: Add NMake nightly CI job
-rw-r--r--.gitlab-ci.yml14
-rw-r--r--.gitlab/ci/configure_windows_vs2022_x64_nmake.cmake1
-rw-r--r--.gitlab/os-windows.yml17
3 files changed, 32 insertions, 0 deletions
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