|
|
@@ -117,6 +117,14 @@
|
|
|
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
|
|
VCVARSPLATFORM: x64
|
|
|
|
|
|
+.windows_vs2019_x64: &windows_vs2019_x64
|
|
|
+ extends: .windows
|
|
|
+
|
|
|
+ variables:
|
|
|
+ CMAKE_CONFIGURATION: windows_vs2019_x64
|
|
|
+ CMAKE_GENERATOR: "Visual Studio 16 2019"
|
|
|
+ CMAKE_GENERATOR_PLATFORM: "x64"
|
|
|
+
|
|
|
.linux_builder_tags: &linux_builder_tags
|
|
|
tags:
|
|
|
- build
|
|
|
@@ -278,9 +286,18 @@
|
|
|
|
|
|
interruptible: true
|
|
|
|
|
|
+.cmake_test_windows_external: &cmake_test_windows_external
|
|
|
+ stage: test-ext
|
|
|
+
|
|
|
+ script:
|
|
|
+ - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake
|
|
|
+
|
|
|
+ interruptible: true
|
|
|
+
|
|
|
stages:
|
|
|
- build
|
|
|
- test
|
|
|
+ - test-ext
|
|
|
|
|
|
build:debian10-iwyu:
|
|
|
<<:
|
|
|
@@ -392,8 +409,20 @@ test:windows-vs2019-x64-ninja:
|
|
|
- *windows_vs2019_x64_ninja
|
|
|
- *cmake_test_windows
|
|
|
- *windows_builder_tags
|
|
|
+ - *cmake_test_artifacts
|
|
|
rules: *rules_settings
|
|
|
dependencies:
|
|
|
- build:windows-vs2019-x64-ninja
|
|
|
needs:
|
|
|
- build:windows-vs2019-x64-ninja
|
|
|
+
|
|
|
+test:windows-vs2019-x64:
|
|
|
+ <<:
|
|
|
+ - *windows_vs2019_x64
|
|
|
+ - *cmake_test_windows_external
|
|
|
+ - *windows_builder_tags
|
|
|
+ rules: *rules_settings
|
|
|
+ dependencies:
|
|
|
+ - test:windows-vs2019-x64-ninja
|
|
|
+ needs:
|
|
|
+ - test:windows-vs2019-x64-ninja
|