From 3ea8c18693c5c0fb71138d9f650eaddfbfb46265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Dutheillet-Lamonth=C3=A9zie?=
 <thomas.dutheillet@ng-analytics.com>
Date: Thu, 29 Aug 2024 11:25:27 +0200
Subject: [PATCH] #97: fix artifacts mesh and png missing

---
 .github/workflows/build-and-test-macos.yml | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml
index 2b1e8be63..f1b683f4b 100644
--- a/.github/workflows/build-and-test-macos.yml
+++ b/.github/workflows/build-and-test-macos.yml
@@ -26,6 +26,7 @@ jobs:
         VT_TV_TESTS_ENABLED: "ON"
         VT_TV_COVERAGE_ENABLED: ${{ matrix.host.compiler.gcov == '' && 'OFF' || 'ON'  }}
         VT_TV_OUTPUT_DIR: /var/vt-tv/output
+        VT_TV_TESTS_OUTPUT_DIR: /opt/src/vt-tv/output/tests
         VT_TV_ARTIFACTS_DIR: /tmp/artifacts
         CC: ~
         CXX: ~
@@ -127,21 +128,9 @@ jobs:
           # > go to output directory
           pushd ${{ env.VT_TV_OUTPUT_DIR }}
 
-          echo "> List Output files"
-          find * | while read line; do echo "- $line"; done
-
           echo "> add junit test report artifact"
           cp "junit-report.xml" ${{ env.VT_TV_ARTIFACTS_DIR }}/ || true
 
-          echo "> add mesh files and png artifacts"
-          if [ -d "${{ env.VT_TV_OUTPUT_DIR }}/tests" ]; then
-            
-
-            ls -l "${{ env.VT_TV_OUTPUT_DIR }}/tests"
-            cp "${{ env.VT_TV_OUTPUT_DIR }}/tests/"*".vtp"  ${{ env.VT_TV_ARTIFACTS_DIR }}/  || true
-            cp "${{ env.VT_TV_OUTPUT_DIR }}/tests/"*".png"  ${{ env.VT_TV_ARTIFACTS_DIR }}/  || true
-          fi
-
           if [[ "${{ env.VT_TV_COVERAGE_ENABLED }}" == "ON" ]]; then
             echo "> add `coverage --list` file artifact"
             lcov --list lcov_vt-tv_test_no_deps.info > ${{ env.VT_TV_ARTIFACTS_DIR }}/lcov-list-report.txt
@@ -155,8 +144,16 @@ jobs:
           fi
           popd
 
-          echo "Collected artifacts:"
-          ls ${{ env.VT_TV_ARTIFACTS_DIR }}
+          echo "> add tests output mesh files and png artifacts"
+          if [ -d "${{ env.VT_TV_TESTS_OUTPUT_DIR }}" ]; then
+            cp "${{ env.VT_TV_TESTS_OUTPUT_DIR }}/"*".vtp"  ${{ env.VT_TV_ARTIFACTS_DIR }}/  || true
+            cp "${{ env.VT_TV_TESTS_OUTPUT_DIR }}/"*".png"  ${{ env.VT_TV_ARTIFACTS_DIR }}/  || true
+          fi
+
+          echo "> list of collected artifacts:"
+          pushd ${{ env.VT_TV_ARTIFACTS_DIR }}
+          find ${{ env.VT_TV_ARTIFACTS_DIR }}  | while read line; do echo "- $line"; done
+          popd
 
       - name: Unit tests
         if: ${{ env.VT_TV_TESTS_ENABLED == 'ON' }}