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

@@ -44,47 +44,44 @@ cppcheck:
paths: paths:
- cppcheck.log - cppcheck.log
VS2017-64-bit-shared-apps: .VS2017_64_TEMPLATE: &VS2017_x64
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "TRUE" script: "CI\Windows.bat"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
tags:
- VS2017
- Qt5101
VS2017-64-bit-shared-apps:
variables:
SHARED: "TRUE"
APPS: "ON"
<<: *VS2017_x64
VS2017-64-bit-static-apps: VS2017-64-bit-static-apps:
variables: variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE" SHARED: "FALSE"
APPS: "ON" APPS: "ON"
script: "CI\\Windows.bat" <<: *VS2017_x64
tags:
- VS2017
- Qt5101
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-shared-no-apps: VS2017-64-bit-shared-no-apps:
variables: variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE" SHARED: "TRUE"
APPS: "OFF" APPS: "OFF"
script: "CI\\Windows.bat" <<: *VS2017_x64
tags:
- VS2017
artifacts: VS2017-64-bit-static-no-apps:
paths: variables:
- build-release/*.exe SHARED: "FALSE"
APPS: "OFF"
<<: *VS2017_x64
VS2017-32-bit-shared-no-apps: VS2017-32-bit-shared-no-apps:
@@ -101,20 +98,6 @@ VS2017-32-bit-shared-no-apps:
- build-release/*.exe - 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: VS2017-32-bit-static-no-apps:
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"