Include the removeHtmlDates.sh script in test-results artifacts

And use one in the collate-test-results job, since we're no longer using the test-results-combined artifact (which included just that same one version of the removeHtmlDates.sh script).
pcolby · Dec 16, 2023 · 0072906 · 0072906
1 parent 1e6b589
commit 0072906
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -50,8 +50,9 @@ jobs:
         name: test-results-${{ env.dokitVersion }}
         path: |
           ${{ runner.temp }}/coverage.info
+          ${{ runner.temp }}/removeHtmlDates.sh
           ${{ runner.temp }}/test/**/*.tap
-        if-no-files-found: ignore
+        if-no-files-found: error
     - name: Prep combined test results
       run: |
         find "$RUNNER_TEMP" \( -name 'coverage.info' -or -name '*.tap' \) -printf '%P\0' |
@@ -144,8 +145,9 @@ jobs:
         name: test-results-${{ env.dokitVersion }}
         path: |
           ${{ runner.temp }}/coverage.info
+          ${{ runner.temp }}/removeHtmlDates.sh
           ${{ runner.temp }}/test/**/*.tap
-        if-no-files-found: ignore
+        if-no-files-found: error
     - name: Prep combined test results
       run: |
         find "$RUNNER_TEMP" \( -name 'coverage.info' -or -name '*.tap' \) -printf '%P\0' |
@@ -243,8 +245,9 @@ jobs:
         name: test-results-${{ env.dokitVersion }}
         path: |
           ${{ runner.temp }}/coverage.info
+          ${{ runner.temp }}/removeHtmlDates.sh
           ${{ runner.temp }}/test/**/*.tap
-        if-no-files-found: ignore
+        if-no-files-found: error
     - name: Prep combined test results
       run: |
         cd "$RUNNER_TEMP" &&
@@ -455,7 +458,8 @@ jobs:
         # Generate the HTML report.
         echo 'genhtml_sort = 0' >> ~/.lcovrc
         genhtml --output-directory coverage coverage.info
-        /usr/bin/env bash ./artifacts/removeHtmlDates.sh
+        # Can use any of the removeHtmlDates.sh scripts here, so the non-cov, linux0 version will do.
+        /usr/bin/env bash ./artifacts/test-results-*.gcc/removeHtmlDates.sh
       working-directory: ${{ runner.temp }}
     - name: Upload HTML coverage report
       uses: actions/upload-artifact@v4