Commit b98fc152 authored by Martin Schultz's avatar Martin Schultz
Browse files

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

parent 9a04fd8b
...@@ -43,69 +43,52 @@ cppcheck: ...@@ -43,69 +43,52 @@ cppcheck:
artifacts: artifacts:
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" artifacts:
script: "CI\\Windows.bat" paths:
- build-release/*.exe
tags: tags:
- VS2017 - VS2017
- Qt5101 - Qt5101
artifacts:
paths: VS2017-64-bit-shared-apps:
- build-release/*.exe 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:
paths:
- build-release/*.exe
VS2017-32-bit-shared-no-apps: VS2017-64-bit-static-no-apps:
variables: variables:
BUILD_PLATFORM: "VS2017" SHARED: "FALSE"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF" APPS: "OFF"
script: "CI\\Windows.bat" <<: *VS2017_x64
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-no-apps:
VS2017-32-bit-shared-no-apps:
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64" ARCHITECTURE: "x32"
SHARED: "FALSE" SHARED: "TRUE"
APPS: "OFF" APPS: "OFF"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment