From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 22 Aug 2020 18:12:49 +0000 (+0200)
Subject: build.yaml: Correct name of directory with test results
X-Git-Tag: v4.0~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba12e94ff7ef77bf357439b4af8fff490f60caa6;p=thirdparty%2Fccache.git

build.yaml: Correct name of directory with test results

As of d575526c91a8e0167a249760d63510e7de67ed23 the test results are
stored in “testdir/*” instead of “testdir.*”.
---

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 88c423812..6eb654fbc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,16 +38,16 @@ jobs:
           ENABLE_CACHE_CLEANUP_TESTS: true
           CTEST_OUTPUT_ON_FAILURE: ON
 
-      - name: Collect testdirs from failed tests
+      - name: Collect testdir from failed tests
         if: failure()
-        run: zip -r testdirs.zip ${{ matrix.config.BUILDDIR }}/testdir.* -x testdir.failed
+        run: zip -r testdir.zip ${{ matrix.config.BUILDDIR }}/testdir
 
-      - name: Upload testdirs from failed tests
+      - name: Upload testdir from failed tests
         if: failure()
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ matrix.config.name }} - testdirs.zip
-          path: testdirs.zip
+          name: ${{ matrix.config.name }} - testdir.zip
+          path: testdir.zip
 
   # These mimic the old Travis tests that are not replaced by standard_tests:
   specific_tests:
@@ -223,14 +223,14 @@ jobs:
       shell: bash
       run: ci/build
 
-    - name: Collect testdirs from failed tests
+    - name: Collect testdir from failed tests
       if: failure()
-      run: zip -r testdirs.zip ${{ matrix.config.BUILDDIR }}/testdir.* -x testdir.failed
+      run: zip -r testdir.zip ${{ matrix.config.BUILDDIR }}/testdir
       # TODO: in case of build-and-verify-package* the BUILDDIR is set within those scripts.
 
-    - name: Upload testdirs from failed tests
+    - name: Upload testdir from failed tests
       if: failure()
       uses: actions/upload-artifact@v2
       with:
-        name: ${{ matrix.config.name }} - testdirs.zip
-        path: testdirs.zip
+        name: ${{ matrix.config.name }} - testdir.zip
+        path: testdir.zip