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

Reduce number of windows jobs

Browse Source
This commit is contained in:
Jan Möbius
2021-02-10 16:09:36 +01:00
parent 3b0362b0b3
commit b5b022978f
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@@ -628,16 +628,17 @@ macos-cpp14-release:
# VS Version: VS2019 # VS Version: VS2019
# Apps: {{APPS}} # Apps: {{APPS}}
build-VS2019-x64-shared-TRUE-no-apps: build-VS2019-x64-shared-TRUE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2019" BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "TRUE" SHARED: "TRUE"
APPS: "OFF" APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2019 - VS2019
- Qt5150
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
@@ -655,16 +656,17 @@ build-VS2019-x64-shared-TRUE-no-apps:
# VS Version: VS2019 # VS Version: VS2019
# Apps: {{APPS}} # Apps: {{APPS}}
build-VS2019-x64-shared-FALSE-no-apps: build-VS2019-x64-shared-FALSE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2019" BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "FALSE" SHARED: "FALSE"
APPS: "OFF" APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2019 - VS2019
- Qt5150
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
@@ -683,16 +685,17 @@ build-VS2019-x64-shared-FALSE-no-apps:
# VS Version: VS2017 # VS Version: VS2017
# Apps: {{APPS}} # Apps: {{APPS}}
build-VS2017-x64-shared-TRUE-no-apps: build-VS2017-x64-shared-TRUE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "TRUE" SHARED: "TRUE"
APPS: "OFF" APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2017 - VS2017
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
@@ -710,16 +713,17 @@ build-VS2017-x64-shared-TRUE-no-apps:
# VS Version: VS2017 # VS Version: VS2017
# Apps: {{APPS}} # Apps: {{APPS}}
build-VS2017-x64-shared-FALSE-no-apps: build-VS2017-x64-shared-FALSE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "FALSE" SHARED: "FALSE"
APPS: "OFF" APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2017 - VS2017
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe

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

@@ -2,11 +2,11 @@
# Windows tasks # Windows tasks
# ----------------- # -----------------
{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150}
{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150}
{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2015, QTTAG=Qt5101} {windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2015, QTTAG=Qt5101}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2015, QTTAG=Qt5101} {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2015, QTTAG=Qt5101}