Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows template support

Browse Source
This commit is contained in:
Johannes Lenzen
2020-05-26 11:34:26 +02:00
parent 7c6a075985
commit 8f9b94cc3a
3 changed files with 98 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
.gitlab-ci.yml
View File

@@ -297,7 +297,15 @@ macos-cpp14-release:
# Windows tasks # 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 stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
@@ -310,25 +318,9 @@ VS2017-64-bit-shared-apps:
- Qt5101 - Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - 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-VS2017-x64-shared-TRUE-no-apps:
VS2017-64-bit-shared-no-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
@@ -341,8 +333,30 @@ VS2017-64-bit-shared-no-apps:
artifacts: artifacts:
paths: paths:
- build-release/*.exe - 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 stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
@@ -356,7 +370,15 @@ VS2017-64-bit-static-no-apps:
paths: paths:
- build-release/*.exe - 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 stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
@@ -366,12 +388,12 @@ VS2015-64-bit-shared-apps:
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2015
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
build-VS2015-x64-shared-TRUE-no-apps:
VS2015-64-bit-shared-no-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
@@ -384,8 +406,15 @@ VS2015-64-bit-shared-no-apps:
artifacts: artifacts:
paths: paths:
- build-release/*.exe - 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 stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
@@ -395,11 +424,12 @@ VS2015-64-bit-static-apps:
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2015
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
VS2015-64-bit-static-no-apps: build-VS2015-x64-shared-FALSE-no-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"

36
CI/gitlab-ci/windows-template-job.yml Normal file
View File

@@ -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

118
CI/gitlab-ci/windows.yml
View File

@@ -2,118 +2,8 @@
# Windows tasks # Windows tasks
# ----------------- # -----------------
VS2017-64-bit-shared-apps: {windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
stage: build {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}
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=VS2015, QTTAG=Qt5101}
VS2017-64-bit-shared-no-apps: {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2015, QTTAG=Qt5101}
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