From 260b77a13205c57190393cd73795cde1ddc4c53b Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 2 Feb 2021 14:25:38 +0100 Subject: [PATCH] Fixed artifact directory --- .gitlab-ci.yml | 64 +++++++++++------------ CI/ci-linux-build.sh | 6 +-- CI/ci-linux-test.sh | 6 +-- CI/gitlab-ci/linux-template-build-job.yml | 2 +- CI/gitlab-ci/linux-template-test-job.yml | 6 +-- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74271714..df7e4440 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ build-debug-gcc-cpp11-qt5.15.1: - stretch artifacts: paths: - - build-gcc-cpp11-debug-qt5.15.1-Vector-Checks/ + - build-gcc-cpp11-qt5.15.1-debug/ #----------- Job Informations: # Type: Test: debug @@ -69,9 +69,9 @@ test-debug-gcc-cpp11-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 #----------- Job Informations: @@ -90,7 +90,7 @@ build-release-gcc-cpp11-qt5.15.1: - stretch artifacts: paths: - - build-gcc-cpp11-release-qt5.15.1-Vector-Checks/ + - build-gcc-cpp11-qt5.15.1-release/ #----------- Job Informations: # Type: Test: release @@ -111,9 +111,9 @@ test-release-gcc-cpp11-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 #----------- Job Informations: @@ -132,7 +132,7 @@ build-debug-clang-cpp11-qt5.15.1: - stretch artifacts: paths: - - build-clang-cpp11-debug-qt5.15.1-Vector-Checks/ + - build-clang-cpp11-qt5.15.1-debug/ #----------- Job Informations: # Type: Test: debug @@ -153,9 +153,9 @@ test-debug-clang-cpp11-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 #----------- Job Informations: @@ -174,7 +174,7 @@ build-release-clang-cpp11-qt5.15.1: - stretch artifacts: paths: - - build-clang-cpp11-release-qt5.15.1-Vector-Checks/ + - build-clang-cpp11-qt5.15.1-release/ #----------- Job Informations: # Type: Test: release @@ -195,9 +195,9 @@ test-release-clang-cpp11-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 #----------- Job Informations: @@ -216,7 +216,7 @@ build-debug-gcc-cpp14-qt5.15.1: - stretch artifacts: paths: - - build-gcc-cpp14-debug-qt5.15.1-Vector-Checks/ + - build-gcc-cpp14-qt5.15.1-debug/ #----------- Job Informations: # Type: Test: debug @@ -237,9 +237,9 @@ test-debug-gcc-cpp14-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 #----------- Job Informations: @@ -258,7 +258,7 @@ build-release-gcc-cpp14-qt5.15.1: - stretch artifacts: paths: - - build-gcc-cpp14-release-qt5.15.1-Vector-Checks/ + - build-gcc-cpp14-qt5.15.1-release/ #----------- Job Informations: # Type: Test: release @@ -279,9 +279,9 @@ test-release-gcc-cpp14-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 #----------- Job Informations: @@ -300,7 +300,7 @@ build-debug-clang-cpp14-qt5.15.1: - stretch artifacts: paths: - - build-clang-cpp14-debug-qt5.15.1-Vector-Checks/ + - build-clang-cpp14-qt5.15.1-debug/ #----------- Job Informations: # Type: Test: debug @@ -321,9 +321,9 @@ test-debug-clang-cpp14-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 #----------- Job Informations: @@ -342,7 +342,7 @@ build-release-clang-cpp14-qt5.15.1: - stretch artifacts: paths: - - build-clang-cpp14-release-qt5.15.1-Vector-Checks/ + - build-clang-cpp14-qt5.15.1-release/ #----------- Job Informations: # Type: Test: release @@ -363,9 +363,9 @@ test-release-clang-cpp14-qt5.15.1: artifacts: reports: junit: - - 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 + - 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 diff --git a/CI/ci-linux-build.sh b/CI/ci-linux-build.sh index 42dca598..503aa4ed 100755 --- a/CI/ci-linux-build.sh +++ b/CI/ci-linux-build.sh @@ -25,11 +25,11 @@ echo "Building $BUILD_TYPE version with vectorchecks enabled" echo "======================================================================" echo -e "${NC}" -if [ ! -d build-$BUILDPATH-Vector-Checks ]; then - mkdir build-$BUILDPATH-Vector-Checks +if [ ! -d build-$BUILDPATH ]; then + mkdir build-$BUILDPATH fi -cd build-$BUILDPATH-Vector-Checks +cd build-$BUILDPATH cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../ diff --git a/CI/ci-linux-test.sh b/CI/ci-linux-test.sh index a9cc5fa8..f8f28c1f 100755 --- a/CI/ci-linux-test.sh +++ b/CI/ci-linux-test.sh @@ -23,11 +23,11 @@ echo "Building $BUILD_TYPE version unittests" echo "======================================================================" echo -e "${NC}" -if [ ! -d build-$BUILDPATH-Vector-Checks ]; then - mkdir build-$BUILDPATH-Vector-Checks +if [ ! -d build-$BUILDPATH ]; then + mkdir build-$BUILDPATH fi -cd build-$BUILDPATH-Vector-Checks +cd build-$BUILDPATH #build the unit tests make $MAKE_OPTIONS unittests diff --git a/CI/gitlab-ci/linux-template-build-job.yml b/CI/gitlab-ci/linux-template-build-job.yml index 7709c095..9cae8caa 100644 --- a/CI/gitlab-ci/linux-template-build-job.yml +++ b/CI/gitlab-ci/linux-template-build-job.yml @@ -14,4 +14,4 @@ build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: - stretch artifacts: paths: - - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-Vector-Checks/ + - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}/ diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index b9723cdf..7dc7fe8d 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -17,7 +17,7 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: artifacts: reports: junit: - - 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 + - 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