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: ...@@ -21,6 +21,26 @@ gcc-c++11-Qt5:
paths: paths:
- artifacts - 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: gcc-c++11-Qt5.9.0:
stage: Build stage: Build
variables: variables:
...@@ -35,7 +55,25 @@ gcc-c++11-Qt5.9.0: ...@@ -35,7 +55,25 @@ gcc-c++11-Qt5.9.0:
expire_in: 1 week expire_in: 1 week
paths: paths:
- artifacts - 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: debug-gcc-c++11-Qt5.9.0:
stage: Build stage: Build
variables: variables:
...@@ -51,104 +89,140 @@ debug-gcc-c++11-Qt5.9.0: ...@@ -51,104 +89,140 @@ debug-gcc-c++11-Qt5.9.0:
expire_in: 1 week expire_in: 1 week
paths: paths:
- artifacts - artifacts
clang-c++11-Qt5: debug-test-gcc-c++11-Qt5.9.0:
stage: Build stage: Test
variables: variables:
COMPILER: "clang" COMPILER: "gcc"
LANGUAGE: "C++11" LANGUAGE: "C++11"
QTVERSION: "QT5" QTVERSION: "QT5.9.0"
GIT_SUBMODULE_STRATEGY: recursive BUILDTYPE: "Debug"
script: "CI/ci-linux-build.sh" GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags: tags:
- Linux - Linux
- MultiThreads dependencies:
- debug-gcc-c++11-Qt5.9.0
artifacts: artifacts:
expire_in: 1 week
paths: 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 stage: Build
variables: variables:
COMPILER: "clang" COMPILER: "gcc"
LANGUAGE: "C++11" LANGUAGE: "C++11"
QTVERSION: "QT5.9.0" QTVERSION: "QT5.11.2"
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh" script: "CI/ci-linux-build.sh"
tags: tags:
- Linux - Linux
- MultiThreads
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
paths: paths:
- artifacts - 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 stage: Build
variables: variables:
COMPILER: "clang" COMPILER: "gcc"
LANGUAGE: "C++11" LANGUAGE: "C++11"
QTVERSION: "QT5.9.0" QTVERSION: "QT5.11.2"
BUILDTYPE: "Debug" BUILDTYPE: "Debug"
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh" script: "CI/ci-linux-build.sh"
tags: tags:
- Linux - Linux
- MultiThreads
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
paths: paths:
- artifacts - artifacts
test-gcc-c++11-Qt5: debug-test-gcc-c++11-Qt5.11.2:
stage: Test stage: Test
variables: variables:
COMPILER: "gcc" COMPILER: "gcc"
LANGUAGE: "C++11" LANGUAGE: "C++11"
QTVERSION: "QT5" QTVERSION: "QT5.11.2"
BUILDTYPE: "Debug"
GIT_STRATEGY: none GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh" script: "artifacts/CI/ci-linux-test.sh"
tags: tags:
- Linux - Linux
dependencies: dependencies:
- gcc-c++11-Qt5 - debug-gcc-c++11-Qt5.11.2
artifacts: artifacts:
paths: 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: clang-c++11-Qt5:
stage: Test stage: Build
variables: variables:
COMPILER: "gcc" COMPILER: "clang"
LANGUAGE: "C++11" 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" QTVERSION: "QT5.9.0"
GIT_STRATEGY: none GIT_SUBMODULE_STRATEGY: recursive
script: "artifacts/CI/ci-linux-test.sh" script: "CI/ci-linux-build.sh"
tags: tags:
- Linux - Linux
dependencies: - MultiThreads
- gcc-c++11-Qt5.9.0
artifacts: artifacts:
expire_in: 1 week
paths: paths:
- build-Release-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log - artifacts
debug-test-gcc-c++11-Qt5.9.0: debug-clang-c++11-Qt5.9.0:
stage: Test stage: Build
variables: variables:
COMPILER: "gcc" COMPILER: "clang"
LANGUAGE: "C++11" LANGUAGE: "C++11"
QTVERSION: "QT5.9.0" QTVERSION: "QT5.9.0"
BUILDTYPE: "Debug" BUILDTYPE: "Debug"
GIT_STRATEGY: none GIT_SUBMODULE_STRATEGY: recursive
script: "artifacts/CI/ci-linux-test.sh" script: "CI/ci-linux-build.sh"
tags: tags:
- Linux - Linux
dependencies: - MultiThreads
- debug-gcc-c++11-Qt5.9.0
artifacts: artifacts:
expire_in: 1 week
paths: paths:
- build-Debug-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log - artifacts
test-clang-c++11-Qt5: test-clang-c++11-Qt5:
stage: Test stage: Test
......
...@@ -47,17 +47,17 @@ elif [ "$LANGUAGE" == "C++11" ]; then ...@@ -47,17 +47,17 @@ elif [ "$LANGUAGE" == "C++11" ]; then
BUILDPATH="$BUILDPATH-cpp11" BUILDPATH="$BUILDPATH-cpp11"
fi fi
if [ "$QTVERSION" == "QT4" ]; then if [ "$QTVERSION" == "QT5" ]; then
echo "Using QT4";
OPTIONS="$OPTIONS -DFORCE_QT4=TRUE "
BUILDPATH="$BUILDPATH-qt4"
elif [ "$QTVERSION" == "QT5" ]; then
echo "Using QT5"; echo "Using QT5";
BUILDPATH="$BUILDPATH-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 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 elif [ "$QTVERSION" == "QT5.9.0" ]; then
echo "Using QT5.9.0"; echo "Using QT5.9.0";
BUILDPATH="$BUILDPATH-qt5.9.0" BUILDPATH="$BUILDPATH-qt5.9.0"
OPTIONS="$OPTIONS -DFORCE_QT4=FALSE -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64" OPTIONS="$OPTIONS -DFORCE_QT4=FALSE -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
fi fi
\ No newline at end of file
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