From b98fc15267d2e59ce804153bc121faf6eb1d110f Mon Sep 17 00:00:00 2001 From: Martin Schultz Date: Wed, 23 May 2018 16:37:33 +0200 Subject: [PATCH] Update .gitlab-ci.yml to use anchors for VS2017x64 definitions --- .gitlab-ci.yml | 71 +++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 44 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95d8d1d6..7202bf35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: