diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 16:50:12 (GMT) |
---|---|---|
committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 16:56:03 (GMT) |
commit | a1fe6ad62129c14e9dcae5c61d40bea55c81a497 (patch) | |
tree | 4f09d7f096f975af62a17fab2555aaddf52c4cb9 /.gitlab/os-windows.yml | |
parent | fda8b79f880877a9f07839dcabc9cd7854685e92 (diff) | |
download | CMake-a1fe6ad62129c14e9dcae5c61d40bea55c81a497.zip CMake-a1fe6ad62129c14e9dcae5c61d40bea55c81a497.tar.gz CMake-a1fe6ad62129c14e9dcae5c61d40bea55c81a497.tar.bz2 |
gitlab-ci: use `extends`
YAML anchors are not supported across include files.
Diffstat (limited to '.gitlab/os-windows.yml')
-rw-r--r-- | .gitlab/os-windows.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 90d4685..910a232 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -2,13 +2,13 @@ ## Base configurations -.windows: &windows +.windows: variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci ext\\$CI_CONCURRENT_ID" ### Build and test -.windows_build: &windows_build +.windows_build: extends: .windows variables: @@ -19,7 +19,7 @@ # could run at the same time, so we drop it. GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci" -.windows_ninja: &windows_ninja +.windows_ninja: extends: .windows_build variables: @@ -29,7 +29,7 @@ CMAKE_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.windows_vs2019_x64_ninja: &windows_vs2019_x64_ninja +.windows_vs2019_x64_ninja: extends: .windows_ninja variables: @@ -40,7 +40,7 @@ ### External testing -.windows_vs2019_x64: &windows_vs2019_x64 +.windows_vs2019_x64: extends: .windows variables: @@ -51,7 +51,7 @@ ## Tags -.windows_builder_tags: &windows_builder_tags +.windows_builder_tags: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -60,7 +60,7 @@ - msvc-19.25 - nonconcurrent -.windows_builder_ext_tags: &windows_builder_ext_tags +.windows_builder_ext_tags: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -81,7 +81,7 @@ - cmake -P .gitlab/ci/download_qt.cmake - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\qt\bin;$env:PATH" -.cmake_build_windows: &cmake_build_windows +.cmake_build_windows: stage: build script: @@ -97,7 +97,7 @@ interruptible: true -.cmake_test_windows: &cmake_test_windows +.cmake_test_windows: stage: test script: @@ -107,7 +107,7 @@ interruptible: true -.cmake_test_windows_external: &cmake_test_windows_external +.cmake_test_windows_external: stage: test-ext script: |