diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4698640..072c9329 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -503,8 +503,8 @@ iwyu-release-clang-cpp14-qt5.15.1: VECTORCHECKS: "yes" artifacts: paths: - - build-clang-cpp14-release-qt5.15.1-iwyu-vectorchecks/compile_commands.json - - build-clang-cpp14-release-qt5.15.1-iwyu-vectorchecks/iwyu.dump + - build-clang-cpp14-qt5.15.1-release-iwyu-vectorchecks/compile_commands.json + - build-clang-cpp14-qt5.15.1-release-iwyu-vectorchecks/iwyu.dump #----------- Job Informations: # Type: Build: release # OS: Linux @@ -527,8 +527,7 @@ nvc-release-clang-cpp14-qt5.15.1: VECTORCHECKS: "no" artifacts: paths: - - build-clang-cpp14-release-qt5.15.1/compile_commands.json - - build-clang-cpp14-release-qt5.15.1/iwyu.dump + - build-clang-cpp14-qt5.15.1-release/ # ----------------- # MAC tasks diff --git a/CI/ci-linux-build.sh b/CI/ci-linux-build.sh index 01caf218..eb64b64d 100755 --- a/CI/ci-linux-build.sh +++ b/CI/ci-linux-build.sh @@ -38,8 +38,6 @@ cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENMESH_BUILD_UNIT_TESTS=TRUE $OPTIONS . if [ "$IWYU" == "yes" ]; then # do iwyu check if echo $(iwyu --version) | grep -q "0.11" - echo $(pwd) - ls -la then # support older tool version iwyu_tool -j 4 -p . -- \ diff --git a/CI/gitlab-ci/linux-iwyu-job.yml b/CI/gitlab-ci/linux-iwyu-job.yml index f0e933c6..cb8b0d58 100644 --- a/CI/gitlab-ci/linux-iwyu-job.yml +++ b/CI/gitlab-ci/linux-iwyu-job.yml @@ -20,5 +20,5 @@ iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: VECTORCHECKS: "yes" artifacts: paths: - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-vectorchecks/compile_commands.json - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-vectorchecks/iwyu.dump + - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}-iwyu-vectorchecks/compile_commands.json + - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}-iwyu-vectorchecks/iwyu.dump