Commit b526a812 authored by Martin Schultz's avatar Martin Schultz

adapted gitlab-ci.yml to use the new bootstrap script on windows

parent 74500f3a
Pipeline #5652 passed with stages
in 57 minutes and 11 seconds
......@@ -18,8 +18,9 @@ gcc-c++11-Qt5:
tags:
- Linux
artifacts:
expire_in: 1 week
paths:
- build-release-gcc-cpp11-qt5/
- artifacts
gcc-c++11-Qt5.9.0:
stage:
......@@ -33,8 +34,9 @@ gcc-c++11-Qt5.9.0:
tags:
- Linux
artifacts:
expire_in: 1 week
paths:
- build-release-gcc-cpp11-qt5.9.0/
- artifacts
clang-c++11-Qt5:
stage:
......@@ -49,8 +51,9 @@ clang-c++11-Qt5:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-release-clang-cpp11-qt5/
- artifacts
clang-c++11-Qt5.9.0:
stage:
......@@ -65,8 +68,9 @@ clang-c++11-Qt5.9.0:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-release-clang-cpp11-qt5.9.0/
- artifacts
test-gcc-c++11-Qt5:
stage:
......@@ -75,8 +79,8 @@ test-gcc-c++11-Qt5:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
......@@ -92,8 +96,8 @@ test-gcc-c++11-Qt5.9.0:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
......@@ -109,8 +113,8 @@ test-clang-c++11-Qt5:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
- MultiThreads
......@@ -127,8 +131,8 @@ test-clang-c++11-Qt5.9.0:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
- MultiThreads
......@@ -141,13 +145,14 @@ test-clang-c++11-Qt5.9.0:
cppcheck:
stage:
Test
script: "CI/ci-cppcheck.sh"
script: "artifacts/CI/ci-cppcheck.sh"
variables:
GIT_SUBMODULE_STRATEGY: recursive
tags:
- Linux
- MultiThreads
dependencies:
- gcc-c++11-Qt5
artifacts:
paths:
- cppcheck.log
......@@ -165,8 +170,9 @@ VS2015-Qt-5.6.2-x64:
- VS2015
- Qt56
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2015-Qt-5.6.2-x32:
stage:
......@@ -181,8 +187,9 @@ VS2015-Qt-5.6.2-x32:
- VS2015
- Qt56
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2015-Qt-5.9.0-x64:
stage:
......@@ -196,8 +203,9 @@ VS2015-Qt-5.9.0-x64:
tags:
- VS2015
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2015-Qt-5.9.0-x32:
stage:
......@@ -211,8 +219,9 @@ VS2015-Qt-5.9.0-x32:
tags:
- VS2015
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2013-Qt-5.5.1-x64:
stage:
......@@ -227,17 +236,20 @@ VS2013-Qt-5.5.1-x64:
- VS2013
- Qt551
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
Test:VS2015-Qt-5.6.2-x64:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt56
......@@ -250,12 +262,13 @@ Test:VS2015-Qt-5.6.2-x64:
Test:VS2015-Qt-5.6.2-x32:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt56
......@@ -268,12 +281,13 @@ Test:VS2015-Qt-5.6.2-x32:
Test:VS2015-Qt-5.9.0-x64:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
dependencies:
......@@ -285,12 +299,13 @@ Test:VS2015-Qt-5.9.0-x64:
Test:VS2015-Qt-5.9.0-x32:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
dependencies:
......@@ -302,12 +317,13 @@ Test:VS2015-Qt-5.9.0-x32:
Test:VS2013-Qt-5.5.1-x64:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
COMPILER: "VS2013"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2013
- Qt551
......@@ -325,7 +341,7 @@ Deploy:VS2015-Qt-5.6.2-x64:
- unstable
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
......@@ -346,7 +362,7 @@ Deploy:VS2015-Qt-5.6.2-x32:
- unstable
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
......@@ -367,7 +383,7 @@ Deploy:VS2015-Qt-5.9.0-x64:
- unstable
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
......@@ -387,7 +403,7 @@ Deploy:VS2015-Qt-5.9.0-x32:
- unstable
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
......@@ -407,7 +423,7 @@ Deploy:VS2013-Qt-5.5.1-x64:
- unstable
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
COMPILER: "VS2013"
......@@ -429,15 +445,16 @@ Mac-Cpp11:
tags:
- Apple
artifacts:
expire_in: 1 week
paths:
- build-release/
- artifacts
Test:Mac-Cpp11:
stage:
Test
script: "CI/ci-mac-test.sh"
script: "artifacts/CI/ci-mac-test.sh"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
tags:
- Apple
dependencies:
......@@ -452,9 +469,9 @@ Deploy:Mac-Cpp11:
only:
- master
- unstable
script: "CI/ci-mac-deploy.sh"
script: "artifacts/CI/ci-mac-deploy.sh"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
tags:
- Apple
dependencies:
......
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