From 8f9b94cc3a949a8751571e50dce5ab1422106a67 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 26 May 2020 11:34:26 +0200 Subject: [PATCH] windows template support --- .gitlab-ci.yml | 86 +++++++++++++------ CI/gitlab-ci/windows-template-job.yml | 36 ++++++++ CI/gitlab-ci/windows.yml | 118 +------------------------- 3 files changed, 98 insertions(+), 142 deletions(-) create mode 100644 CI/gitlab-ci/windows-template-job.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75ed8497..d9f4bc08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -297,7 +297,15 @@ macos-cpp14-release: # Windows tasks # ----------------- -VS2017-64-bit-shared-apps: +#------------- Job Informations: +# Type: Build+Test: Release +# OS: Windows +# Architecture: x64 +# Shared: TRUE +# VS Version: VS2017 +# Apps: {{APPS}} + +build-VS2017-x64-shared-TRUE-apps: stage: build variables: BUILD_PLATFORM: "VS2017" @@ -310,25 +318,9 @@ VS2017-64-bit-shared-apps: - 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 + - build-release/*.exe - -VS2017-64-bit-shared-no-apps: +build-VS2017-x64-shared-TRUE-no-apps: stage: build variables: BUILD_PLATFORM: "VS2017" @@ -341,8 +333,30 @@ VS2017-64-bit-shared-no-apps: artifacts: paths: - build-release/*.exe +#------------- Job Informations: +# Type: Build+Test: Release +# OS: Windows +# Architecture: x64 +# Shared: FALSE +# VS Version: VS2017 +# Apps: {{APPS}} -VS2017-64-bit-static-no-apps: +build-VS2017-x64-shared-FALSE-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 + +build-VS2017-x64-shared-FALSE-no-apps: stage: build variables: BUILD_PLATFORM: "VS2017" @@ -356,7 +370,15 @@ VS2017-64-bit-static-no-apps: paths: - build-release/*.exe -VS2015-64-bit-shared-apps: +#------------- Job Informations: +# Type: Build+Test: Release +# OS: Windows +# Architecture: x64 +# Shared: TRUE +# VS Version: VS2015 +# Apps: {{APPS}} + +build-VS2015-x64-shared-TRUE-apps: stage: build variables: BUILD_PLATFORM: "VS2015" @@ -366,12 +388,12 @@ VS2015-64-bit-shared-apps: script: "CI\\Windows.bat" tags: - VS2015 + - Qt5101 artifacts: paths: - - build-release/*.exe - - -VS2015-64-bit-shared-no-apps: + - build-release/*.exe + +build-VS2015-x64-shared-TRUE-no-apps: stage: build variables: BUILD_PLATFORM: "VS2015" @@ -384,8 +406,15 @@ VS2015-64-bit-shared-no-apps: artifacts: paths: - build-release/*.exe +#------------- Job Informations: +# Type: Build+Test: Release +# OS: Windows +# Architecture: x64 +# Shared: FALSE +# VS Version: VS2015 +# Apps: {{APPS}} -VS2015-64-bit-static-apps: +build-VS2015-x64-shared-FALSE-apps: stage: build variables: BUILD_PLATFORM: "VS2015" @@ -395,11 +424,12 @@ VS2015-64-bit-static-apps: script: "CI\\Windows.bat" tags: - VS2015 + - Qt5101 artifacts: paths: - - build-release/*.exe + - build-release/*.exe -VS2015-64-bit-static-no-apps: +build-VS2015-x64-shared-FALSE-no-apps: stage: build variables: BUILD_PLATFORM: "VS2015" diff --git a/CI/gitlab-ci/windows-template-job.yml b/CI/gitlab-ci/windows-template-job.yml new file mode 100644 index 00000000..2c31c4f9 --- /dev/null +++ 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 diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml index 5577eaf7..0000105c 100644 --- 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}