windows template support

2020-05-26 11:34:26 +02:00
parent 7c6a075985
commit 8f9b94cc3a
3 changed files with 98 additions and 142 deletions
--- a/CI/gitlab-ci/windows-template-job.yml
+++ b/CI/gitlab-ci/windows-template-job.yml
@@ -0,0 +1,36 @@
+#-------------  Job Informations:
+# Type:         Build+Test: Release
+# OS:           Windows
+# Architecture: {{ARCHITECTURE}}
+# Shared:       {{SHARED}}
+# VS Version:   {{VSVERSION}}
+# Apps:         {{APPS}}
+
+build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-apps:
+  stage: build
+  variables:
+    BUILD_PLATFORM: "{{VSVERSION}}"
+    ARCHITECTURE:   "{{ARCHITECTURE}}"
+    SHARED:         "{{SHARED}}"
+    APPS:           "ON"
+  script: "CI\\Windows.bat"
+  tags:
+    - {{VSVERSION}}
+    - {{QTTAG}}
+  artifacts:
+    paths:
+      - build-release/*.exe   
+
+build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-no-apps:
+  stage: build
+  variables:
+    BUILD_PLATFORM: "{{VSVERSION}}"
+    ARCHITECTURE:   "{{ARCHITECTURE}}"
+    SHARED:         "{{SHARED}}"
+    APPS:           "OFF"
+  script: "CI\\Windows.bat"
+  tags:
+    - {{VSVERSION}}
+  artifacts:
+    paths:
+      - build-release/*.exe
--- a/CI/gitlab-ci/windows.yml
+++ b/CI/gitlab-ci/windows.yml
@@ -2,118 +2,8 @@
 # Windows tasks
 # -----------------

-VS2017-64-bit-shared-apps:
-  stage: build
-  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:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2017"
-    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2017
-    - Qt5101    
-  artifacts:
-    paths:
-      - build-release/*.exe
+{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
+{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}

-      
-VS2017-64-bit-shared-no-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2017"
-    ARCHITECTURE:   "x64"
-    SHARED:         "TRUE"
-    APPS:           "OFF"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2017
-  artifacts:
-    paths:
-      - build-release/*.exe
-
-VS2017-64-bit-static-no-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2017"
-    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
-    APPS:           "OFF"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2017
-  artifacts:
-    paths:
-      - build-release/*.exe
-
-VS2015-64-bit-shared-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2015"
-    ARCHITECTURE:   "x64"
-    SHARED:         "TRUE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2015
-  artifacts:
-    paths:
-      - build-release/*.exe
-      
-      
-VS2015-64-bit-shared-no-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2015"
-    ARCHITECTURE:   "x64"
-    SHARED:         "TRUE"
-    APPS:           "OFF"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2015
-  artifacts:
-    paths:
-      - build-release/*.exe
-
-VS2015-64-bit-static-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2015"
-    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2015
-  artifacts:
-    paths:
-      - build-release/*.exe
-
-VS2015-64-bit-static-no-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2015"
-    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
-    APPS:           "OFF"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2015
-  artifacts:
-    paths:
-      - build-release/*.exe
+{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2015, QTTAG=Qt5101}
+{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2015, QTTAG=Qt5101}