diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd9d6cac..e4698640 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,9 +52,10 @@ build-debug-gcc-cpp11-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-gcc-cpp11-qt5.15.1-debug/ + - build-gcc-cpp11-qt5.15.1-debug-vectorchecks/ #----------- Job Informations: # Type: Test: debug @@ -76,14 +77,15 @@ test-debug-gcc-cpp11-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-debug-gcc-cpp11-qt5.15.1] needs: [build-debug-gcc-cpp11-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp11-qt5.15.1-debug/Unittests/report.xml - - build-gcc-cpp11-qt5.15.1-debug/Unittests/report-customvec.xml - - build-gcc-cpp11-qt5.15.1-debug/Unittests/report-doublevec.xml + - build-gcc-cpp11-qt5.15.1-debug-vectorchecks/Unittests/report.xml + - build-gcc-cpp11-qt5.15.1-debug-vectorchecks/Unittests/report-customvec.xml + - build-gcc-cpp11-qt5.15.1-debug-vectorchecks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -106,9 +108,10 @@ build-release-gcc-cpp11-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-gcc-cpp11-qt5.15.1-release/ + - build-gcc-cpp11-qt5.15.1-release-vectorchecks/ #----------- Job Informations: # Type: Test: release @@ -130,14 +133,15 @@ test-release-gcc-cpp11-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-release-gcc-cpp11-qt5.15.1] needs: [build-release-gcc-cpp11-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp11-qt5.15.1-release/Unittests/report.xml - - build-gcc-cpp11-qt5.15.1-release/Unittests/report-customvec.xml - - build-gcc-cpp11-qt5.15.1-release/Unittests/report-doublevec.xml + - build-gcc-cpp11-qt5.15.1-release-vectorchecks/Unittests/report.xml + - build-gcc-cpp11-qt5.15.1-release-vectorchecks/Unittests/report-customvec.xml + - build-gcc-cpp11-qt5.15.1-release-vectorchecks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -160,9 +164,10 @@ build-debug-clang-cpp11-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-clang-cpp11-qt5.15.1-debug/ + - build-clang-cpp11-qt5.15.1-debug-vectorchecks/ #----------- Job Informations: # Type: Test: debug @@ -184,14 +189,15 @@ test-debug-clang-cpp11-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-debug-clang-cpp11-qt5.15.1] needs: [build-debug-clang-cpp11-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp11-qt5.15.1-debug/Unittests/report.xml - - build-clang-cpp11-qt5.15.1-debug/Unittests/report-customvec.xml - - build-clang-cpp11-qt5.15.1-debug/Unittests/report-doublevec.xml + - build-clang-cpp11-qt5.15.1-debug-vectorchecks/Unittests/report.xml + - build-clang-cpp11-qt5.15.1-debug-vectorchecks/Unittests/report-customvec.xml + - build-clang-cpp11-qt5.15.1-debug-vectorchecks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -214,9 +220,10 @@ build-release-clang-cpp11-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-clang-cpp11-qt5.15.1-release/ + - build-clang-cpp11-qt5.15.1-release-vectorchecks/ #----------- Job Informations: # Type: Test: release @@ -238,14 +245,15 @@ test-release-clang-cpp11-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-release-clang-cpp11-qt5.15.1] needs: [build-release-clang-cpp11-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp11-qt5.15.1-release/Unittests/report.xml - - build-clang-cpp11-qt5.15.1-release/Unittests/report-customvec.xml - - build-clang-cpp11-qt5.15.1-release/Unittests/report-doublevec.xml + - build-clang-cpp11-qt5.15.1-release-vectorchecks/Unittests/report.xml + - build-clang-cpp11-qt5.15.1-release-vectorchecks/Unittests/report-customvec.xml + - build-clang-cpp11-qt5.15.1-release-vectorchecks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -268,9 +276,10 @@ build-debug-gcc-cpp14-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-gcc-cpp14-qt5.15.1-debug/ + - build-gcc-cpp14-qt5.15.1-debug-vectorchecks/ #----------- Job Informations: # Type: Test: debug @@ -292,14 +301,15 @@ test-debug-gcc-cpp14-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-debug-gcc-cpp14-qt5.15.1] needs: [build-debug-gcc-cpp14-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp14-qt5.15.1-debug/Unittests/report.xml - - build-gcc-cpp14-qt5.15.1-debug/Unittests/report-customvec.xml - - build-gcc-cpp14-qt5.15.1-debug/Unittests/report-doublevec.xml + - build-gcc-cpp14-qt5.15.1-debug-vectorchecks/Unittests/report.xml + - build-gcc-cpp14-qt5.15.1-debug-vectorchecks/Unittests/report-customvec.xml + - build-gcc-cpp14-qt5.15.1-debug-vectorchecks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -322,9 +332,10 @@ build-release-gcc-cpp14-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-gcc-cpp14-qt5.15.1-release/ + - build-gcc-cpp14-qt5.15.1-release-vectorchecks/ #----------- Job Informations: # Type: Test: release @@ -346,14 +357,15 @@ test-release-gcc-cpp14-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-release-gcc-cpp14-qt5.15.1] needs: [build-release-gcc-cpp14-qt5.15.1] artifacts: reports: junit: - - build-gcc-cpp14-qt5.15.1-release/Unittests/report.xml - - build-gcc-cpp14-qt5.15.1-release/Unittests/report-customvec.xml - - build-gcc-cpp14-qt5.15.1-release/Unittests/report-doublevec.xml + - build-gcc-cpp14-qt5.15.1-release-vectorchecks/Unittests/report.xml + - build-gcc-cpp14-qt5.15.1-release-vectorchecks/Unittests/report-customvec.xml + - build-gcc-cpp14-qt5.15.1-release-vectorchecks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -376,9 +388,10 @@ build-debug-clang-cpp14-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-clang-cpp14-qt5.15.1-debug/ + - build-clang-cpp14-qt5.15.1-debug-vectorchecks/ #----------- Job Informations: # Type: Test: debug @@ -400,14 +413,15 @@ test-debug-clang-cpp14-qt5.15.1: BUILD_TYPE: "debug" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-debug-clang-cpp14-qt5.15.1] needs: [build-debug-clang-cpp14-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp14-qt5.15.1-debug/Unittests/report.xml - - build-clang-cpp14-qt5.15.1-debug/Unittests/report-customvec.xml - - build-clang-cpp14-qt5.15.1-debug/Unittests/report-doublevec.xml + - build-clang-cpp14-qt5.15.1-debug-vectorchecks/Unittests/report.xml + - build-clang-cpp14-qt5.15.1-debug-vectorchecks/Unittests/report-customvec.xml + - build-clang-cpp14-qt5.15.1-debug-vectorchecks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -430,9 +444,10 @@ build-release-clang-cpp14-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-clang-cpp14-qt5.15.1-release/ + - build-clang-cpp14-qt5.15.1-release-vectorchecks/ #----------- Job Informations: # Type: Test: release @@ -454,14 +469,15 @@ test-release-clang-cpp14-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-release-clang-cpp14-qt5.15.1] needs: [build-release-clang-cpp14-qt5.15.1] artifacts: reports: junit: - - build-clang-cpp14-qt5.15.1-release/Unittests/report.xml - - build-clang-cpp14-qt5.15.1-release/Unittests/report-customvec.xml - - build-clang-cpp14-qt5.15.1-release/Unittests/report-doublevec.xml + - build-clang-cpp14-qt5.15.1-release-vectorchecks/Unittests/report.xml + - build-clang-cpp14-qt5.15.1-release-vectorchecks/Unittests/report-customvec.xml + - build-clang-cpp14-qt5.15.1-release-vectorchecks/Unittests/report-doublevec.xml @@ -484,10 +500,35 @@ iwyu-release-clang-cpp14-qt5.15.1: BUILD_TYPE: "release" QTVERSION: "qt5.15.1" IWYU: "yes" + VECTORCHECKS: "yes" artifacts: paths: - - build-clang-cpp14-release-qt5.15.1-iwyu-Vector-Checks/compile_commands.json - - build-clang-cpp14-release-qt5.15.1-iwyu-Vector-Checks/iwyu.dump + - build-clang-cpp14-release-qt5.15.1-iwyu-vectorchecks/compile_commands.json + - build-clang-cpp14-release-qt5.15.1-iwyu-vectorchecks/iwyu.dump +#----------- Job Informations: +# Type: Build: release +# OS: Linux +# Compiler: clang +# Language: cpp14 + +nvc-release-clang-cpp14-qt5.15.1: + stage: build + script: "CI/ci-linux-build.sh" + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + BUILD_TYPE: "release" + QTVERSION: "qt5.15.1" + IWYU: "no" + VECTORCHECKS: "no" + artifacts: + paths: + - build-clang-cpp14-release-qt5.15.1/compile_commands.json + - build-clang-cpp14-release-qt5.15.1/iwyu.dump # ----------------- # MAC tasks diff --git a/CI/ci-linux-build.sh b/CI/ci-linux-build.sh index 05431423..eb64b64d 100755 --- a/CI/ci-linux-build.sh +++ b/CI/ci-linux-build.sh @@ -18,12 +18,14 @@ echo "BuildPath: $BUILDPATH" echo "Path: $PATH" echo "Language: $LANGUAGE" -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Building $BUILD_TYPE version with vectorchecks enabled" -echo "======================================================================" -echo -e "${NC}" +if [ "$VECTORCHECKS" == "yes" ]; then + echo -e "${OUTPUT}" + echo "" + echo "======================================================================" + echo "Building $BUILD_TYPE version with vectorchecks enabled" + echo "======================================================================" + echo -e "${NC}" +fi if [ ! -d build-$BUILDPATH ]; then mkdir build-$BUILDPATH @@ -31,9 +33,9 @@ fi cd build-$BUILDPATH -cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../ +cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENMESH_BUILD_UNIT_TESTS=TRUE $OPTIONS ../ -if [ "$IWYU" == "IWYU" ]; then +if [ "$IWYU" == "yes" ]; then # do iwyu check if echo $(iwyu --version) | grep -q "0.11" then diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 2cad2ff7..bcd93cbf 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -86,4 +86,10 @@ if [ "$IWYU" == "yes" ]; then OPTIONS="$OPTIONS -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" fi +if [ "$VECTORCHECKS" == "yes" ]; then + echo "Vectorchecks enabled."; + BUILDPATH="$BUILDPATH-vectorchecks" + OPTIONS="$OPTIONS -DSTL_VECTOR_CHECKS=ON" +fi + echo "Building to directory $BUILDPATH" diff --git a/CI/gitlab-ci/linux-iwyu-job.yml b/CI/gitlab-ci/linux-iwyu-job.yml index 5f27eff7..f0e933c6 100644 --- a/CI/gitlab-ci/linux-iwyu-job.yml +++ b/CI/gitlab-ci/linux-iwyu-job.yml @@ -17,7 +17,8 @@ iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: BUILD_TYPE: "{{BUILDTYPE}}" QTVERSION: "{{QT_VERSION}}" IWYU: "yes" + VECTORCHECKS: "yes" artifacts: paths: - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-Vector-Checks/compile_commands.json - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-Vector-Checks/iwyu.dump + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-vectorchecks/compile_commands.json + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-vectorchecks/iwyu.dump diff --git a/CI/gitlab-ci/linux-novchecks-job.yml b/CI/gitlab-ci/linux-novchecks-job.yml new file mode 100644 index 00000000..9492f722 --- /dev/null +++ b/CI/gitlab-ci/linux-novchecks-job.yml @@ -0,0 +1,24 @@ +#----------- Job Informations: +# Type: Build: {{BUILDTYPE}} +# OS: Linux +# Compiler: {{COMPILER}} +# Language: {{LANGUAGE}} + +nvc-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: + stage: build + script: "CI/ci-linux-build.sh" + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + variables: + COMPILER: "{{COMPILER}}" + LANGUAGE: "{{LANGUAGE}}" + BUILD_TYPE: "{{BUILDTYPE}}" + QTVERSION: "{{QT_VERSION}}" + IWYU: "no" + VECTORCHECKS: "no" + artifacts: + paths: + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}/compile_commands.json + - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}/iwyu.dump diff --git a/CI/gitlab-ci/linux-template-build-job.yml b/CI/gitlab-ci/linux-template-build-job.yml index 4462ac0e..bd1d5b42 100644 --- a/CI/gitlab-ci/linux-template-build-job.yml +++ b/CI/gitlab-ci/linux-template-build-job.yml @@ -18,6 +18,7 @@ build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: BUILD_TYPE: "{{BUILDTYPE}}" QTVERSION: "{{QT_VERSION}}" IWYU: "no" + VECTORCHECKS: "yes" artifacts: paths: - - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}/ + - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}-vectorchecks/ diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index 92f80d30..5b84581a 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -18,12 +18,13 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: BUILD_TYPE: "{{BUILDTYPE}}" QTVERSION: "{{QT_VERSION}}" IWYU: "no" + VECTORCHECKS: "yes" dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}] needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}] artifacts: reports: junit: - - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}/Unittests/report.xml - - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}/Unittests/report-customvec.xml - - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}/Unittests/report-doublevec.xml + - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}-vectorchecks/Unittests/report.xml + - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}-vectorchecks/Unittests/report-customvec.xml + - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}-vectorchecks/Unittests/report-doublevec.xml diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index ece94791..6d1653ad 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -18,3 +18,4 @@ cppcheck: {linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} {linux-iwyu-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} +{linux-novchecks-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1}