Update .gitlab-ci.yml to use anchors for VS2017x64 definitions
This commit is contained in:
@@ -43,48 +43,45 @@ 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"
|
|
||||||
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
|
|
||||||
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:
|
||||||
|
variables:
|
||||||
|
SHARED: "FALSE"
|
||||||
|
APPS: "ON"
|
||||||
|
<<: *VS2017_x64
|
||||||
|
|
||||||
|
|
||||||
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:
|
||||||
@@ -99,20 +96,6 @@ VS2017-32-bit-shared-no-apps:
|
|||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- 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:
|
||||||
|
|||||||
Reference in New Issue
Block a user