Commit 128e2b50 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'Move_to_Qt-5.7_for_VS2013' into 'master'

Move to qt 5.7 for vs2013

See merge request !329
parents fcf12488 7e3c3619
Pipeline #7723 failed with stages
in 64 minutes and 53 seconds
......@@ -216,65 +216,33 @@ cppcheck:
paths:
- cppcheck.log
VS2015-Qt-5.6.2-x64:
VS2015-Qt-5.10.1-x64:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.6.2"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
tags:
- VS2015
- Qt562
artifacts:
expire_in: 1 week
paths:
- artifacts
VS2015-Qt-5.6.2-x32:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
tags:
- VS2015
- Qt562
artifacts:
expire_in: 1 week
paths:
- artifacts
VS2015-Qt-5.9.0-x64:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
tags:
- VS2015
- Qt59
- Qt5101
artifacts:
expire_in: 1 week
paths:
- artifacts
VS2015-Qt-5.9.0-x32:
VS2015-Qt-5.10.1-x32:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.9.0"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
tags:
- VS2015
- Qt59
- Qt5101
artifacts:
expire_in: 1 week
paths:
......@@ -296,94 +264,58 @@ VS2017-Qt-5.10.1:
paths:
- artifacts
VS2013-Qt-5.5.1-x64:
VS2013-Qt-5.10.1-x64:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2013"
tags:
- VS2013
- Qt551
- Qt5101
artifacts:
expire_in: 1 week
paths:
- artifacts
Test:VS2015-Qt-5.6.2-x64:
Test:VS2015-Qt-5.10.1-x64:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.6.2"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt562
- Qt5101
dependencies:
- VS2015-Qt-5.6.2-x64
- VS2015-Qt-5.10.1-x64
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2015-Qt-5.6.2-x32:
Test:VS2015-Qt-5.10.1-x32:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.6.2"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt562
dependencies:
- VS2015-Qt-5.6.2-x32
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2015-Qt-5.9.0-x64:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt59
- Qt5101
dependencies:
- VS2015-Qt-5.9.0-x64
- VS2015-Qt-5.10.1-x32
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2015-Qt-5.9.0-x32:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt59
dependencies:
- 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"
......@@ -402,25 +334,25 @@ Test:VS2017-Qt-5.10.1:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2013-Qt-5.5.1-x64:
Test:VS2013-Qt-5.10.1-x64:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2013"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2013
- Qt551
- Qt5101
dependencies:
- VS2013-Qt-5.5.1-x64
- VS2013-Qt-5.10.1-x64
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Deploy:VS2015-Qt-5.6.2-x64:
Deploy:VS2015-Qt-5.10.1-x64:
stage: Deploy
only:
- master
......@@ -429,19 +361,19 @@ Deploy:VS2015-Qt-5.6.2-x64:
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.6.2"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
- Qt562
- Qt5101
dependencies:
- VS2015-Qt-5.6.2-x64
- VS2015-Qt-5.10.1-x64
artifacts:
paths:
- rel/*.exe
Deploy:VS2015-Qt-5.6.2-x32:
Deploy:VS2015-Qt-5.10.1-x32:
stage: Deploy
only:
- master
......@@ -450,60 +382,18 @@ Deploy:VS2015-Qt-5.6.2-x32:
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.6.2"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
- Qt562
dependencies:
- VS2015-Qt-5.6.2-x32
artifacts:
paths:
- rel/*.exe
Deploy:VS2015-Qt-5.9.0-x64:
stage: Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
- Qt59
- Qt5101
dependencies:
- VS2015-Qt-5.9.0-x64
- VS2015-Qt-5.10.1-x32
artifacts:
paths:
- rel/*.exe
Deploy:VS2015-Qt-5.9.0-x32:
stage: Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
- Qt59
dependencies:
- VS2015-Qt-5.9.0-x32
artifacts:
paths:
- rel/*.exe
Deploy:VS2017-Qt-5.10.1:
stage: Deploy
only:
......@@ -525,7 +415,7 @@ Deploy:VS2017-Qt-5.10.1:
paths:
- rel/*.exe
Deploy:VS2013-Qt-5.5.1-x64:
Deploy:VS2013-Qt-5.10.1-x64:
stage: Deploy
only:
- master
......@@ -534,14 +424,14 @@ Deploy:VS2013-Qt-5.5.1-x64:
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2013"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2013
- Qt551
- Qt5101
dependencies:
- VS2013-Qt-5.5.1-x64
- VS2013-Qt-5.10.1-x64
artifacts:
paths:
- rel/*.exe
......
@echo off
::########################################
::# Fetch test data
::########################################
......@@ -10,6 +11,10 @@ git clone git@roosevelt.informatik.rwth-aachen.de:moebius/OpenFlipper-Test-Data.
::load configuration and settings
call %~dp0\ci-windows-config.bat
echo "CMAKE_CONFIGURATION: %CMAKE_CONFIGURATION%"
mkdir rel
cd rel
......@@ -35,4 +40,4 @@ cd ..
robocopy . artifacts /e /NFL /NDL /NJH /NJS /nc /ns /np /xd artifacts /xd .git
::robocopy uses some error codes different from 0
IF %errorlevel% LSS 8 exit /b 0
\ No newline at end of file
IF %errorlevel% LSS 8 exit /b 0
Subproject commit ddb27712fd63bf6abcc3a3a541977d1910523531
Subproject commit 19dd8917198fec77a14515c02598c39e218be830
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