From 53d8207c0f44ee994461eb812a9e130aecdd60c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 15 Jan 2021 14:55:14 +0100 Subject: [PATCH] Wrong compiler --- .gitlab-ci.yml | 28 ++++++++++++++-------------- CI/gitlab-ci/windows.yml | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 351500fa..5fa85660 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -417,19 +417,19 @@ macos-cpp14-release: # OS: Windows # Architecture: x64 # Shared: TRUE -# VS Version: VS2017 +# VS Version: VS2019 # Apps: {{APPS}} -build-VS2017-x64-shared-TRUE-apps: +build-VS2019-x64-shared-TRUE-apps: stage: build variables: - BUILD_PLATFORM: "VS2017" + BUILD_PLATFORM: "VS2019" ARCHITECTURE: "x64" SHARED: "TRUE" APPS: "ON" script: "CI\\Windows.bat" tags: - - VS2017 + - VS2019 - Qt5150 artifacts: paths: @@ -440,16 +440,16 @@ build-VS2017-x64-shared-TRUE-apps: - build-release/unittests/report-customvec.xml - build-release/unittests/report-doublevec.xml -build-VS2017-x64-shared-TRUE-no-apps: +build-VS2019-x64-shared-TRUE-no-apps: stage: build variables: - BUILD_PLATFORM: "VS2017" + BUILD_PLATFORM: "VS2019" ARCHITECTURE: "x64" SHARED: "TRUE" APPS: "OFF" script: "CI\\Windows.bat" tags: - - VS2017 + - VS2019 artifacts: paths: - build-release/*.exe @@ -464,19 +464,19 @@ build-VS2017-x64-shared-TRUE-no-apps: # OS: Windows # Architecture: x64 # Shared: FALSE -# VS Version: VS2017 +# VS Version: VS2019 # Apps: {{APPS}} -build-VS2017-x64-shared-FALSE-apps: +build-VS2019-x64-shared-FALSE-apps: stage: build variables: - BUILD_PLATFORM: "VS2017" + BUILD_PLATFORM: "VS2019" ARCHITECTURE: "x64" SHARED: "FALSE" APPS: "ON" script: "CI\\Windows.bat" tags: - - VS2017 + - VS2019 - Qt5150 artifacts: paths: @@ -487,16 +487,16 @@ build-VS2017-x64-shared-FALSE-apps: - build-release/unittests/report-customvec.xml - build-release/unittests/report-doublevec.xml -build-VS2017-x64-shared-FALSE-no-apps: +build-VS2019-x64-shared-FALSE-no-apps: stage: build variables: - BUILD_PLATFORM: "VS2017" + BUILD_PLATFORM: "VS2019" ARCHITECTURE: "x64" SHARED: "FALSE" APPS: "OFF" script: "CI\\Windows.bat" tags: - - VS2017 + - VS2019 artifacts: paths: - build-release/*.exe diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml index afd182aa..b46c2ffa 100644 --- a/CI/gitlab-ci/windows.yml +++ b/CI/gitlab-ci/windows.yml @@ -2,8 +2,8 @@ # Windows tasks # ----------------- -{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5150} -{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5150} +{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150} +{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150} {windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101} {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}