diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10742901..4c366eae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,15 +37,24 @@ cppcheck: # OS: Linux # Compiler: gcc # Language: cpp11 +# QT Version: qt5.15.1 -build-debug-gcc-cpp11: +build-debug-gcc-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh gcc cpp11 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-gcc-cpp11-debug-Vector-Checks/ + - build-gcc-cpp11-debug-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: debug @@ -53,19 +62,28 @@ build-debug-gcc-cpp11: # Compiler: gcc # Language: cpp11 -test-debug-gcc-cpp11: +test-debug-gcc-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh gcc cpp11 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-debug-gcc-cpp11] - needs: [build-debug-gcc-cpp11] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-debug-gcc-cpp11-qt5.15.1] + needs: [build-debug-gcc-cpp11-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp11-debug-Vector-Checks/Unittests/report.xml - - build-gcc-cpp11-debug-Vector-Checks/Unittests/report-customvec.xml - - build-gcc-cpp11-debug-Vector-Checks/Unittests/report-doublevec.xml + - build-gcc-cpp11-debug-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-gcc-cpp11-debug-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-gcc-cpp11-debug-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -73,15 +91,24 @@ test-debug-gcc-cpp11: # OS: Linux # Compiler: gcc # Language: cpp11 +# QT Version: qt5.15.1 -build-release-gcc-cpp11: +build-release-gcc-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh gcc cpp11 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-gcc-cpp11-release-Vector-Checks/ + - build-gcc-cpp11-release-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: release @@ -89,19 +116,28 @@ build-release-gcc-cpp11: # Compiler: gcc # Language: cpp11 -test-release-gcc-cpp11: +test-release-gcc-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh gcc cpp11 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-release-gcc-cpp11] - needs: [build-release-gcc-cpp11] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-release-gcc-cpp11-qt5.15.1] + needs: [build-release-gcc-cpp11-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp11-release-Vector-Checks/Unittests/report.xml - - build-gcc-cpp11-release-Vector-Checks/Unittests/report-customvec.xml - - build-gcc-cpp11-release-Vector-Checks/Unittests/report-doublevec.xml + - build-gcc-cpp11-release-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-gcc-cpp11-release-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-gcc-cpp11-release-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -109,15 +145,24 @@ test-release-gcc-cpp11: # OS: Linux # Compiler: clang # Language: cpp11 +# QT Version: qt5.15.1 -build-debug-clang-cpp11: +build-debug-clang-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh clang cpp11 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-clang-cpp11-debug-Vector-Checks/ + - build-clang-cpp11-debug-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: debug @@ -125,19 +170,28 @@ build-debug-clang-cpp11: # Compiler: clang # Language: cpp11 -test-debug-clang-cpp11: +test-debug-clang-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh clang cpp11 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-debug-clang-cpp11] - needs: [build-debug-clang-cpp11] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-debug-clang-cpp11-qt5.15.1] + needs: [build-debug-clang-cpp11-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp11-debug-Vector-Checks/Unittests/report.xml - - build-clang-cpp11-debug-Vector-Checks/Unittests/report-customvec.xml - - build-clang-cpp11-debug-Vector-Checks/Unittests/report-doublevec.xml + - build-clang-cpp11-debug-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-clang-cpp11-debug-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-clang-cpp11-debug-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -145,15 +199,24 @@ test-debug-clang-cpp11: # OS: Linux # Compiler: clang # Language: cpp11 +# QT Version: qt5.15.1 -build-release-clang-cpp11: +build-release-clang-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh clang cpp11 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-clang-cpp11-release-Vector-Checks/ + - build-clang-cpp11-release-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: release @@ -161,19 +224,28 @@ build-release-clang-cpp11: # Compiler: clang # Language: cpp11 -test-release-clang-cpp11: +test-release-clang-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh clang cpp11 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-release-clang-cpp11] - needs: [build-release-clang-cpp11] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-release-clang-cpp11-qt5.15.1] + needs: [build-release-clang-cpp11-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp11-release-Vector-Checks/Unittests/report.xml - - build-clang-cpp11-release-Vector-Checks/Unittests/report-customvec.xml - - build-clang-cpp11-release-Vector-Checks/Unittests/report-doublevec.xml + - build-clang-cpp11-release-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-clang-cpp11-release-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-clang-cpp11-release-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -181,15 +253,24 @@ test-release-clang-cpp11: # OS: Linux # Compiler: gcc # Language: cpp14 +# QT Version: qt5.15.1 -build-debug-gcc-cpp14: +build-debug-gcc-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh gcc cpp14 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "gcc" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-gcc-cpp14-debug-Vector-Checks/ + - build-gcc-cpp14-debug-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: debug @@ -197,19 +278,28 @@ build-debug-gcc-cpp14: # Compiler: gcc # Language: cpp14 -test-debug-gcc-cpp14: +test-debug-gcc-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh gcc cpp14 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-debug-gcc-cpp14] - needs: [build-debug-gcc-cpp14] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "gcc" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-debug-gcc-cpp14-qt5.15.1] + needs: [build-debug-gcc-cpp14-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp14-debug-Vector-Checks/Unittests/report.xml - - build-gcc-cpp14-debug-Vector-Checks/Unittests/report-customvec.xml - - build-gcc-cpp14-debug-Vector-Checks/Unittests/report-doublevec.xml + - build-gcc-cpp14-debug-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-gcc-cpp14-debug-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-gcc-cpp14-debug-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -217,15 +307,24 @@ test-debug-gcc-cpp14: # OS: Linux # Compiler: gcc # Language: cpp14 +# QT Version: qt5.15.1 -build-release-gcc-cpp14: +build-release-gcc-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh gcc cpp14 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "gcc" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-gcc-cpp14-release-Vector-Checks/ + - build-gcc-cpp14-release-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: release @@ -233,19 +332,28 @@ build-release-gcc-cpp14: # Compiler: gcc # Language: cpp14 -test-release-gcc-cpp14: +test-release-gcc-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh gcc cpp14 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-release-gcc-cpp14] - needs: [build-release-gcc-cpp14] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "gcc" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-release-gcc-cpp14-qt5.15.1] + needs: [build-release-gcc-cpp14-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp14-release-Vector-Checks/Unittests/report.xml - - build-gcc-cpp14-release-Vector-Checks/Unittests/report-customvec.xml - - build-gcc-cpp14-release-Vector-Checks/Unittests/report-doublevec.xml + - build-gcc-cpp14-release-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-gcc-cpp14-release-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-gcc-cpp14-release-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -253,15 +361,24 @@ test-release-gcc-cpp14: # OS: Linux # Compiler: clang # Language: cpp14 +# QT Version: qt5.15.1 -build-debug-clang-cpp14: +build-debug-clang-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh clang cpp14 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-clang-cpp14-debug-Vector-Checks/ + - build-clang-cpp14-debug-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: debug @@ -269,19 +386,28 @@ build-debug-clang-cpp14: # Compiler: clang # Language: cpp14 -test-debug-clang-cpp14: +test-debug-clang-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh clang cpp14 debug" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-debug-clang-cpp14] - needs: [build-debug-clang-cpp14] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "debug" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-debug-clang-cpp14-qt5.15.1] + needs: [build-debug-clang-cpp14-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp14-debug-Vector-Checks/Unittests/report.xml - - build-clang-cpp14-debug-Vector-Checks/Unittests/report-customvec.xml - - build-clang-cpp14-debug-Vector-Checks/Unittests/report-doublevec.xml + - build-clang-cpp14-debug-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-clang-cpp14-debug-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-clang-cpp14-debug-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -289,15 +415,24 @@ test-debug-clang-cpp14: # OS: Linux # Compiler: clang # Language: cpp14 +# QT Version: qt5.15.1 -build-release-clang-cpp14: +build-release-clang-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh clang cpp14 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-clang-cpp14-release-Vector-Checks/ + - build-clang-cpp14-release-qt5.15.1-Vector-Checks/ #----------- Job Informations: # Type: Test: release @@ -305,19 +440,28 @@ build-release-clang-cpp14: # Compiler: clang # Language: cpp14 -test-release-clang-cpp14: +test-release-clang-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh clang cpp14 release" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-release-clang-cpp14] - needs: [build-release-clang-cpp14] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + QTVERSION: "qt5.15.1" + BUILDTYPE: "release" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-release-clang-cpp14-qt5.15.1] + needs: [build-release-clang-cpp14-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp14-release-Vector-Checks/Unittests/report.xml - - build-clang-cpp14-release-Vector-Checks/Unittests/report-customvec.xml - - build-clang-cpp14-release-Vector-Checks/Unittests/report-doublevec.xml + - build-clang-cpp14-release-qt5.15.1-Vector-Checks/Unittests/report.xml + - build-clang-cpp14-release-qt5.15.1-Vector-Checks/Unittests/report-customvec.xml + - build-clang-cpp14-release-qt5.15.1-Vector-Checks/Unittests/report-doublevec.xml diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index ce6ef2c6..e66cf5f9 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -44,6 +44,32 @@ elif [ "$LANGUAGE" == "cpp14" ]; then BUILDPATH="$BUILDPATH-cpp14" fi +if [ "$QTVERSION" == "qt5.13.0" ]; then + echo "Using QT5.13.0"; + BUILDPATH="$BUILDPATH-qt5.13.0" + OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.13.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.13.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.13.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64" +elif [ "$QTVERSION" == "qt5.12.2" ]; then + echo "Using QT5.12.2"; + BUILDPATH="$BUILDPATH-qt5.12.2" + OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.12.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.12.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.12.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64" +elif [ "$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" + OPTIONS="$OPTIONS -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" +elif [ "$QTVERSION" == "qt5.13.2" ]; then + echo "Using QT5.13.2"; + BUILDPATH="$BUILDPATH-qt5.13.2" + OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.13.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.13.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.13.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64" +elif [ "$QTVERSION" == "qt5.15.1" ]; then + echo "Using QT5.15.1"; + BUILDPATH="$BUILDPATH-qt5.15.1" + OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.5-qt5.15.1/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.5-qt5.15.1/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.5-qt5.15.1/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64" +fi + #===================================== # Color Settings: #===================================== diff --git a/CI/gitlab-ci/linux-template-build-job.yml b/CI/gitlab-ci/linux-template-build-job.yml index 4dce86a3..82889e41 100644 --- a/CI/gitlab-ci/linux-template-build-job.yml +++ b/CI/gitlab-ci/linux-template-build-job.yml @@ -3,12 +3,21 @@ # OS: Linux # Compiler: {{COMPILER}} # Language: {{LANGUAGE}} +# QT Version: {{QT_VERSION}} -build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: +build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: build script: "CI/ci-linux-build.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}}" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + variables: + COMPILER: "{{COMPILER}}" + LANGUAGE: "{{LANGUAGE}}" + QTVERSION: "{{QT_VERSION}}" + BUILDTYPE: "{{BUILDTYPE}}" + GIT_SUBMODULE_STRATEGY: recursive + tags: + - Linux + - stretch artifacts: paths: - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/ + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-Vector-Checks/ diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index efc091ab..10c5eddf 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -4,17 +4,26 @@ # Compiler: {{COMPILER}} # Language: {{LANGUAGE}} -test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: +test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: test script: "CI/ci-linux-test.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}}" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: [Docker] - dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] - needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "{{COMPILER}}" + LANGUAGE: "{{LANGUAGE}}" + QTVERSION: "{{QT_VERSION}}" + BUILDTYPE: "{{BUILDTYPE}}" + GIT_SUBMODULE_STRATEGY: recursive + dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}] + needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}] artifacts: reports: junit: - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report.xml - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report-customvec.xml - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report-doublevec.xml + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-Vector-Checks/Unittests/report.xml + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-Vector-Checks/Unittests/report-customvec.xml + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-Vector-Checks/Unittests/report-doublevec.xml diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index fdc85ffe..ece94791 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -12,9 +12,9 @@ cppcheck: paths: - cppcheck.log -{linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp11} -{linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp11} -{linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp14} -{linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp14} +{linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp11, QT_VERSION=qt5.15.1} +{linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp11, QT_VERSION=qt5.15.1} +{linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} +{linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} -{linux-iwyu-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14} +{linux-iwyu-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1}