Commit 013e3525 authored by schultz's avatar schultz

added VS2017 x64 Qt5.10.1 configuration to CI build roster

added vs2017 and Qt5.10.1 to windows ci config scripts
checked out openflipper branch with patches for VS2017 freeglut linking
parent 5b95ab9b
Pipeline #6971 failed with stages
in 51 minutes and 56 seconds
......@@ -294,7 +294,23 @@ VS2015-Qt-5.9.0-x32:
expire_in: 1 week
paths:
- artifacts
VS2017-Qt-5.10.1:
stage:
Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2017"
tags:
- VS2017
artifacts:
expire_in: 1 week
paths:
- artifacts
VS2013-Qt-5.5.1-x64:
stage:
Build
......@@ -385,7 +401,25 @@ Test:VS2015-Qt-5.9.0-x32:
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2017-Qt-5.10.1:
stage:
Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2017"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2017
dependencies:
- VS2017-Qt-5.10.1
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2013-Qt-5.5.1-x64:
stage:
Test
......@@ -490,6 +524,27 @@ Deploy:VS2015-Qt-5.9.0-x32:
artifacts:
paths:
- rel/*.exe
Deploy:VS2017-Qt-5.10.1:
stage:
Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2017"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2017
dependencies:
- VS2017-Qt-5.10.1
artifacts:
paths:
- rel/*.exe
Deploy:VS2013-Qt-5.5.1-x64:
stage:
......
......@@ -20,6 +20,12 @@ set VS_COMPILERVERSION_LONG=14.0
set VS_COMPILERVERSION_SHORT=14
set VS_EDITION_YEAR=2015
)
if "%COMPILER%" == "VS2017" (
set QT_COMPILERPREFIX=msvc2017
set VS_COMPILERVERSION_LONG=15.0
set VS_COMPILERVERSION_SHORT=15
set VS_EDITION_YEAR=2017
)
set BUILD_PLATFORM=%COMPILER%
......@@ -58,6 +64,10 @@ if "%QT_VERSION%" == "Qt5.9.0" (
set QT_REV_LONG=5.9.0
set QT_REV=5.9
)
if "%QT_VERSION%" == "Qt5.10.1" (
set QT_REV_LONG=5.10.1
set QT_REV=5.10
)
set QT_SUFFIX=
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPREFIX%%ARCHBITS%%QT_SUFFIX%
......
Subproject commit baa3af2da15e6badbfb935eb351f191822620267
Subproject commit 745a7fdab46c0c2bd3c8666e393f715f40829143
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