Update .gitlab-ci.yml to use anchors for VS2017x64 definitions

This commit is contained in:
Martin Schultz
2018-05-23 16:37:33 +02:00
parent 9a04fd8b2b
commit b98fc15267

View File

@@ -43,48 +43,45 @@ cppcheck:
artifacts:
paths:
- cppcheck.log
VS2017-64-bit-shared-apps:
.VS2017_64_TEMPLATE: &VS2017_x64
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
script: "CI\Windows.bat"
artifacts:
paths:
- build-release/*.exe
tags:
- VS2017
- Qt5101
VS2017-64-bit-shared-apps:
variables:
SHARED: "TRUE"
APPS: "ON"
<<: *VS2017_x64
VS2017-64-bit-static-apps:
variables:
SHARED: "FALSE"
APPS: "ON"
<<: *VS2017_x64
VS2017-64-bit-shared-no-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
<<: *VS2017_x64
VS2017-64-bit-static-no-apps:
variables:
SHARED: "FALSE"
APPS: "OFF"
<<: *VS2017_x64
VS2017-32-bit-shared-no-apps:
@@ -99,20 +96,6 @@ VS2017-32-bit-shared-no-apps:
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-no-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2017-32-bit-static-no-apps: