diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-29 13:03:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-29 13:03:06 (GMT) |
| commit | 9656a0f55a3084899af8297bdf4cd3b28622ae11 (patch) | |
| tree | 9a52f3fc5358b22e6a77f59512804ed69c2d62dd /.gitlab-ci.yml | |
| parent | 50c438b23e4155d1fe756a0041452e801f683171 (diff) | |
| parent | 0d5a1fd6e2edb4960c4c515c38ba58943ad06d50 (diff) | |
| download | CMake-9656a0f55a3084899af8297bdf4cd3b28622ae11.zip CMake-9656a0f55a3084899af8297bdf4cd3b28622ae11.tar.gz CMake-9656a0f55a3084899af8297bdf4cd3b28622ae11.tar.bz2 | |
Merge topic 'gitlab-ci-toolsets'
0d5a1fd6e2 gitlab-ci: pin windows and macos jobs to runners with matching toolsets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4817
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4c4490..d797955 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,7 +117,8 @@ variables: CMAKE_CONFIGURATION: windows_vs2019_x64_ninja VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" - VCVARSPLATFORM: x64 + VCVARSPLATFORM: "x64" + VCVARSVERSION: "14.25" .windows_vs2019_x64: &windows_vs2019_x64 extends: .windows @@ -126,6 +127,7 @@ CMAKE_CONFIGURATION: windows_vs2019_x64 CMAKE_GENERATOR: "Visual Studio 16 2019" CMAKE_GENERATOR_PLATFORM: "x64" + CMAKE_GENERATOR_TOOLSET: "v142,version=14.25" .linux_builder_tags: &linux_builder_tags tags: @@ -145,12 +147,15 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell + - xcode-11.3 .windows_builder_tags: &windows_builder_tags tags: - cmake # Since this is a bare runner, pin to a project. - windows - shell + - vs2019 + - msvc-19.25 .before_script_unix: &before_script_unix - .gitlab/ci/cmake.sh |