From 801a569871f501e2f29e2168b6dbfcc22e09b4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 18 Apr 2018 09:26:41 +0200 Subject: [PATCH] Enabled 64-bit app builds --- .gitlab-ci.yml | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df974a87..72839651 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,20 +44,6 @@ cppcheck: paths: - cppcheck.log - -.VS2015-64-bit-shared-apps: - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x64" - SHARED: "TRUE" - APPS: "ON" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - .VS2015-32-bit-shared-apps: variables: BUILD_PLATFORM: "VS2015" @@ -71,18 +57,6 @@ cppcheck: paths: - build-release/*.exe -.VS2015-64-bit-static-apps: - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x64" - SHARED: "FALSE" - APPS: "ON" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe .VS2015-32-bit-static-apps: variables: @@ -98,6 +72,33 @@ cppcheck: - build-release/*.exe +VS2017-64-bit-shared-apps: + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2017 + 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 + artifacts: + paths: + - build-release/*.exe + + VS2017-64-bit-shared-no-apps: variables: BUILD_PLATFORM: "VS2017"