]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/ci-print-failure-name-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2023 20:07:45 +0000 (12:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2023 20:07:45 +0000 (12:07 -0800)
(cosmetic) CI regression fix.

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

1  2 
.github/workflows/main.yml

index 8af3c67f605ab9559b45c726c9c73facf73e8013,eb694427f699a4b915f784bd69a3690207e2cd12..5afa73092d01605e205dc53cfd04f989c5f71a24
@@@ -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}}
      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}}