Fixed artifact directory

2021-02-02 14:25:38 +01:00
parent 10fb852ae6
commit 260b77a132
5 changed files with 42 additions and 42 deletions
--- 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



--- 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 ../

--- 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
--- 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}}/
--- 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