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

Added QT 5.11.2 as test build

parent 1bfdb76c
Pipeline #7801 failed with stages
in 1 minute and 50 seconds
......@@ -21,6 +21,26 @@ gcc-c++11-Qt5:
paths:
- artifacts
test-gcc-c++11-Qt5:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5
artifacts:
paths:
- build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
gcc-c++11-Qt5.9.0:
stage: Build
variables:
......@@ -36,6 +56,24 @@ gcc-c++11-Qt5.9.0:
paths:
- artifacts
test-gcc-c++11-Qt5.9.0:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5.9.0
artifacts:
paths:
- build-Release-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
debug-gcc-c++11-Qt5.9.0:
stage: Build
variables:
......@@ -52,103 +90,139 @@ debug-gcc-c++11-Qt5.9.0:
paths:
- artifacts
clang-c++11-Qt5:
stage: Build
debug-test-gcc-c++11-Qt5.9.0:
stage: Test
variables:
COMPILER: "clang"
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
QTVERSION: "QT5.9.0"
BUILDTYPE: "Debug"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
- MultiThreads
dependencies:
- debug-gcc-c++11-Qt5.9.0
artifacts:
expire_in: 1 week
paths:
- artifacts
- build-Debug-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
clang-c++11-Qt5.9.0:
gcc-c++11-Qt5.11.2:
stage: Build
variables:
COMPILER: "clang"
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
QTVERSION: "QT5.11.2"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- artifacts
debug-clang-c++11-Qt5.9.0:
test-gcc-c++11-Qt5.11.2:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.11.2"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5.11.2
artifacts:
paths:
- build-Release-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log
debug-gcc-c++11-Qt5.11.2:
stage: Build
variables:
COMPILER: "clang"
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
QTVERSION: "QT5.11.2"
BUILDTYPE: "Debug"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- artifacts
test-gcc-c++11-Qt5:
debug-test-gcc-c++11-Qt5.11.2:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
QTVERSION: "QT5.11.2"
BUILDTYPE: "Debug"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5
- debug-gcc-c++11-Qt5.11.2
artifacts:
paths:
- build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
- build-Debug-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log
test-gcc-c++11-Qt5.9.0:
stage: Test
clang-c++11-Qt5:
stage: Build
variables:
COMPILER: "gcc"
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- artifacts
clang-c++11-Qt5.9.0:
stage: Build
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5.9.0
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-Release-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
- artifacts
debug-test-gcc-c++11-Qt5.9.0:
stage: Test
debug-clang-c++11-Qt5.9.0:
stage: Build
variables:
COMPILER: "gcc"
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
BUILDTYPE: "Debug"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
dependencies:
- debug-gcc-c++11-Qt5.9.0
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-Debug-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
- artifacts
test-clang-c++11-Qt5:
stage: Test
......
......@@ -47,15 +47,15 @@ elif [ "$LANGUAGE" == "C++11" ]; then
BUILDPATH="$BUILDPATH-cpp11"
fi
if [ "$QTVERSION" == "QT4" ]; then
echo "Using QT4";
OPTIONS="$OPTIONS -DFORCE_QT4=TRUE "
BUILDPATH="$BUILDPATH-qt4"
elif [ "$QTVERSION" == "QT5" ]; then
if [ "$QTVERSION" == "QT5" ]; then
echo "Using QT5";
BUILDPATH="$BUILDPATH-qt5"
OPTIONS="$OPTIONS -DFORCE_QT4=FALSE -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.2-qt5/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.2-qt5/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.2-qt5/lib/libqwt-qt5.so -DQT5_INSTALL_PATH=~/sw/qt-5.5.1/5.5/gcc_64"
OPTIONS="$OPTIONS =FALSE -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.2-qt5/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.2-qt5/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.2-qt5/lib/libqwt-qt5.so -DQT5_INSTALL_PATH=~/sw/qt-5.5.1/5.5/gcc_64"
export LD_LIBRARY_PATH=~/sw/qt-5.5.1/5.5/gcc_64/lib:$LD_LIBRARY_PATH
if [ "$QTVERSION" == "QT5.11.2" ]; then
echo "Using QT5.11.2";
BUILDPATH="$BUILDPATH-qt5.11.2"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.11.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.11.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.11.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64"
elif [ "$QTVERSION" == "QT5.9.0" ]; then
echo "Using QT5.9.0";
BUILDPATH="$BUILDPATH-qt5.9.0"
......
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