Enabled 64-bit app builds

801a5698 · Jan Möbius · d563cdac · 801a5698
Commit 801a5698 authored Apr 18, 2018 by Jan Möbius
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 15 deletions

.gitlab-ci.yml .gitlab-ci.yml +16 -15

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,11 +44,10 @@ cppcheck:
    paths:
      - cppcheck.log

-
-.VS2015-64-bit-shared-apps:
+.VS2015-32-bit-shared-apps:
  variables:
    BUILD_PLATFORM: "VS2015"
-    ARCHITECTURE:   "x64"
+    ARCHITECTURE:   "x32"
    SHARED:         "TRUE"
    APPS:           "ON"
  script: "CI\\Windows.bat"
@@ -58,11 +57,12 @@ cppcheck:
    paths:
      - build-release/*.exe

-.VS2015-32-bit-shared-apps:
+
+.VS2015-32-bit-static-apps:
  variables:
    BUILD_PLATFORM: "VS2015"
    ARCHITECTURE:   "x32"
-    SHARED:         "TRUE"
+    SHARED:         "FALSE"
    APPS:           "ON"
  script: "CI\\Windows.bat"
  tags:
@@ -71,28 +71,29 @@ cppcheck:
    paths:
      - build-release/*.exe

-.VS2015-64-bit-static-apps:
+      
+VS2017-64-bit-shared-apps:
  variables:
-    BUILD_PLATFORM: "VS2015"
+    BUILD_PLATFORM: "VS2017"
    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
+    SHARED:         "TRUE"
    APPS:           "ON"
  script: "CI\\Windows.bat"
  tags:
-    - VS2015
+    - VS2017
  artifacts:
    paths:
-      - build-release/*.exe
-
-.VS2015-32-bit-static-apps:
+      - build-release/*.exe      
+      
+VS2017-64-bit-static-apps:
  variables:
-    BUILD_PLATFORM: "VS2015"
-    ARCHITECTURE:   "x32"
+    BUILD_PLATFORM: "VS2017"
+    ARCHITECTURE:   "x64"
    SHARED:         "FALSE"
    APPS:           "ON"
  script: "CI\\Windows.bat"
  tags:
-    - VS2015
+    - VS2017
  artifacts:
    paths:
      - build-release/*.exe