For new CI, fixed paths for copying of plots when there's a differenc…

…e in output from PR changes
NCAR · May 8, 2024 · 1bd34d5 · 1bd34d5
1 parent 5e9d1a4
commit 1bd34d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -200,7 +200,7 @@ jobs:
         if: ${{ always() }}
         run: |
           mkdir -p $GITHUB_WORKSPACE/test_report
-          cp -r $GITHUB_WORKSPACE/candidate/build/Run/output_${{ matrix.configuration }}/* $GITHUB_WORKSPACE/test_report/
+          cp -r $GITHUB_WORKSPACE/candidate/build/Run/output_diff/diff_plots/* $GITHUB_WORKSPACE/test_report/
 
       - name: Attach diff plots to PR
         if: ${{ always() }}
@@ -214,5 +214,4 @@ jobs:
         with:
           name: test-reports
           path: |
-            ${{ github.workspace }}/test_report/**.html
-            ${{ github.workspace }}/test_report/*/diff_plots
+            ${{ github.workspace }}/test_report/*
diff --git a/tests/local/utils/attach_all_plots.bash b/tests/local/utils/attach_all_plots.bash
@@ -3,10 +3,10 @@
 PR=$1
 CONFIG=$2
 cwd=`pwd`
-diffs=$GITHUB_WORKSPACE/test_report/$CONFIG/diff_plots
+diffs=$GITHUB_WORKSPACE/test_report/$CONFIG
 
 if [[ ! -d $diffs ]]; then
-    echo "No diff plots to attach!"
+    echo "No diff plots to attach at ${diffs}"
     exit 0
 fi
 
@@ -24,6 +24,6 @@ cd $diffs
 for d in `ls -1`
 do
         if [[ -d $d && `ls -1 $d` ]]; then
-            python $cwd/attach_plots_to_pr.py -r $REPO -p $PR -d -t "$TOKEN" --title "$title" $d/* 
+            python $cwd/attach_plots_to_pr.py -r $REPO -p $PR -d -t "$TOKEN" --title "$title" $d/*
         fi
-done
+done