From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jan 2023 20:07:45 +0000 (-0800)
Subject: Merge branch 'pw/ci-print-failure-name-fix'
X-Git-Tag: v2.40.0-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42f9a60013bd30ed6aee1a5002c26f58a1531f95;p=thirdparty%2Fgit.git

Merge branch 'pw/ci-print-failure-name-fix'

(cosmetic) CI regression fix.

* pw/ci-print-failure-name-fix:
  ci(github): restore "print test failures" step name
---

42f9a60013bd30ed6aee1a5002c26f58a1531f95
diff --cc .github/workflows/main.yml
index 8af3c67f60,eb694427f6..5afa73092d
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -262,14 -258,15 +262,15 @@@ jobs
        runs_on_pool: ${{matrix.vector.pool}}
      runs-on: ${{matrix.vector.pool}}
      steps:
 -    - uses: actions/checkout@v2
 +    - uses: actions/checkout@v3
      - run: ci/install-dependencies.sh
      - run: ci/run-build-and-tests.sh
-     - run: ci/print-test-failures.sh
+     - name: print test failures
        if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+       run: ci/print-test-failures.sh
      - name: Upload failed tests' directories
        if: failure() && env.FAILED_TEST_ARTIFACTS != ''
 -      uses: actions/upload-artifact@v2
 +      uses: actions/upload-artifact@v3
        with:
          name: failed-tests-${{matrix.vector.jobname}}
          path: ${{env.FAILED_TEST_ARTIFACTS}}
@@@ -292,22 -290,14 +293,23 @@@
      runs-on: ubuntu-latest
      container: ${{matrix.vector.image}}
      steps:
 +    - uses: actions/checkout@v3
 +      if: matrix.vector.jobname != 'linux32'
      - uses: actions/checkout@v1
 +      if: matrix.vector.jobname == 'linux32'
      - run: ci/install-docker-dependencies.sh
      - run: ci/run-build-and-tests.sh
-     - run: ci/print-test-failures.sh
+     - name: print test failures
        if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+       run: ci/print-test-failures.sh
      - name: Upload failed tests' directories
 -      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
 +      if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname != 'linux32'
 +      uses: actions/upload-artifact@v3
 +      with:
 +        name: failed-tests-${{matrix.vector.jobname}}
 +        path: ${{env.FAILED_TEST_ARTIFACTS}}
 +    - name: Upload failed tests' directories
 +      if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname == 'linux32'
        uses: actions/upload-artifact@v1
        with:
          name: failed-tests-${{matrix.vector.jobname}}