gitlab-ci: Refactor vcvars settings on Windows jobs
Move references closer to where the variables are needed.
This commit is contained in:
parent
45bc3e6631
commit
c612b86ddc
@ -1,5 +1,12 @@
|
||||
.windows_vs2019:
|
||||
variables:
|
||||
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
||||
VCVARSPLATFORM: "x64"
|
||||
VCVARSVERSION: "14.25"
|
||||
|
||||
.cmake_build_windows: &cmake_build_windows
|
||||
extends:
|
||||
- .windows_vs2019
|
||||
stage: build
|
||||
timeout: 2 hours
|
||||
interruptible: true
|
||||
@ -39,6 +46,8 @@
|
||||
|
||||
|
||||
.cmake_test_windows: &cmake_test_windows
|
||||
extends:
|
||||
- .windows_vs2019
|
||||
stage: test
|
||||
timeout: 50 minutes
|
||||
interruptible: true
|
||||
@ -51,12 +60,6 @@
|
||||
#due to system load are not reported
|
||||
- "ctest-latest -VV -S .gitlab/ci/ctest_test.cmake"
|
||||
|
||||
.windows_vs2019:
|
||||
variables:
|
||||
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
||||
VCVARSPLATFORM: "x64"
|
||||
VCVARSVERSION: "14.25"
|
||||
|
||||
# Build on windows10 with Visual Studio
|
||||
# Will have CUDA 10.2 once build issues are resolved
|
||||
build:windows_vs2019:
|
||||
@ -70,7 +73,6 @@ build:windows_vs2019:
|
||||
- msvc-19.25
|
||||
- large-memory
|
||||
extends:
|
||||
- .windows_vs2019
|
||||
- .cmake_build_windows
|
||||
- .only-default
|
||||
variables:
|
||||
@ -92,7 +94,6 @@ test:windows_vs2019:
|
||||
- cuda-rt
|
||||
- turing
|
||||
extends:
|
||||
- .windows_vs2019
|
||||
- .cmake_test_windows
|
||||
- .only-default
|
||||
dependencies:
|
||||
|
Loading…
Reference in New Issue
Block a user