Commit a7bec5aa authored by Jan Möbius's avatar Jan Möbius

First try

parent f00e5987
......@@ -400,6 +400,22 @@ VS2017-Qt-5.14.1:
paths:
- artifacts
VS2017-Qt-5.15.0:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.0"
COMPILER: "VS2019"
tags:
- VS2019
- Qt5150
artifacts:
expire_in: 1 week
paths:
- artifacts
Test:VS2017-Qt-5.14.1:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
......@@ -419,6 +435,25 @@ Test:VS2017-Qt-5.14.1:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2019-Qt-5.15.0:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.0"
COMPILER: "VS2019"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2019
- Qt5150
dependencies:
- VS2019-Qt-5.15.0
needs: [VS2019-Qt-5.15.0]
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Deploy:VS2017-Qt-5.14.1:
stage: Deploy
only:
......@@ -440,6 +475,28 @@ Deploy:VS2017-Qt-5.14.1:
artifacts:
paths:
- rel/*.exe
Deploy:VS2019-Qt-5.15.0:
stage: Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.9"
COMPILER: "VS2019"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2019
- Qt5150
dependencies:
- VS2019-Qt-5.15.0
needs: [VS2019-Qt-5.15.0]
artifacts:
paths:
- rel/*.exe
Mac-Cpp11:
stage: Build
......
......@@ -9,6 +9,7 @@ set VS_COMPILERVERSION_SHORT=14
set VS_EDITION_YEAR=2015
set VS_EDITION_PATH= 14.0
)
if "%COMPILER%" == "VS2017" (
set QT_COMPILERPREFIX=msvc2017
set VS_COMPILERVERSION_LONG=15.0
......@@ -18,6 +19,15 @@ set VS_EDITION_YEAR=2017
set VS_EDITION_PATH=\2017\Professional
)
if "%COMPILER%" == "VS2019" (
set QT_COMPILERPREFIX=msvc2019
set VS_COMPILERVERSION_LONG=16.0
set VS_COMPILERVERSION_SHORT=16
set VS_EDITION_YEAR=2019
::VS2017 default install path is different from other versions
set VS_EDITION_PATH=\2019\Professional
)
set BUILD_PLATFORM=%COMPILER%
:: determine architecture and set variables
......@@ -67,6 +77,10 @@ if "%QT_VERSION%" == "Qt5.14.1" (
set QT_REV_LONG=5.14.1
set QT_REV=5.14.1
)
if "%QT_VERSION%" == "Qt5.15.0" (
set QT_REV_LONG=5.15.0
set QT_REV=5.15.0
)
set QT_SUFFIX=
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPREFIX%%ARCHBITS%%QT_SUFFIX%
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment