diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4feb3435..09dbbe73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -482,30 +482,7 @@ test-release-clang-cpp14-qt5.15.1: -#----------- Job Informations: -# Type: Build: release -# OS: Linux -# Compiler: clang -# Language: cpp14 - -iwyu-release-clang-cpp14-qt5.15.1: - stage: build - script: "CI/ci-linux-build.sh" - image: gitlab.vci.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: "yes" - VECTORCHECKS: "yes" - artifacts: - paths: - - build-clang-cpp14-qt5.15.1-release-iwyu-vectorchecks/compile_commands.json - - build-clang-cpp14-qt5.15.1-release-iwyu-vectorchecks/iwyu.dump +#{linux-iwyu-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} #----------- Job Informations: # Type: Build: release # OS: Linux @@ -534,47 +511,6 @@ nvc-release-clang-cpp14-qt5.15.1: # MAC tasks # ----------------- -#----------- Job Informations: -# Type: Build+Test: debug -# OS: Mac -# Language: cpp11 - -macos-cpp11-debug: - stage: build - script: "CI/ci-mac-build.sh cpp11 debug ; CI/ci-mac-test.sh cpp11 debug" - tags: - - Apple - artifacts: - paths: - - build-debug-cpp11/*.dmg - - build-debug-cpp11/*.tar.gz -# reports: -# junit: -# - build-debug-cpp11/Unittests/report.xml -# - build-debug-cpp11/Unittests/report-customvec.xml -# - build-debug-cpp11/Unittests/report-doublevec.xml - -#----------- Job Informations: -# Type: Build+Test: release -# OS: Mac -# Language: cpp11 - -macos-cpp11-release: - stage: build - script: "CI/ci-mac-build.sh cpp11 release ; CI/ci-mac-test.sh cpp11 release" - tags: - - Apple - artifacts: - paths: - - build-release-cpp11/*.dmg - - build-release-cpp11/*.tar.gz -# reports: -# junit: -# - build-release-cpp11/Unittests/report.xml -# - build-release-cpp11/Unittests/report-customvec.xml -# - build-release-cpp11/Unittests/report-doublevec.xml - - #----------- Job Informations: # Type: Build+Test: debug # OS: Mac diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index abb53a8b..5499c5fa 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -18,5 +18,5 @@ cppcheck: {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, 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} diff --git a/CI/gitlab-ci/mac.yml b/CI/gitlab-ci/mac.yml index 57d973c2..40107d97 100644 --- a/CI/gitlab-ci/mac.yml +++ b/CI/gitlab-ci/mac.yml @@ -2,9 +2,6 @@ # MAC tasks # ----------------- -{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp11} -{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp11} - {mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp14} {mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp14}