From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Dec 2022 05:01:06 +0000 (+0900)
Subject: Merge branch 'js/ci-use-newer-up-down-artifact'
X-Git-Tag: v2.39.0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=481d274aae436b1a84f99e3a000ed67cabe758fa;p=thirdparty%2Fgit.git

Merge branch 'js/ci-use-newer-up-down-artifact'

CI fix.

* js/ci-use-newer-up-down-artifact:
  ci: avoid using deprecated {up,down}load-artifacts Action
---

481d274aae436b1a84f99e3a000ed67cabe758fa
diff --cc .github/workflows/main.yml
index 71bf71bbe9,739e0f89cd..e67847a682
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -262,14 -258,16 +262,14 @@@ 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
 -    - name: print test failures
 +    - run: ci/print-test-failures.sh
        if: failure() && env.FAILED_TEST_ARTIFACTS != ''
 -      shell: bash
 -      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,16 -291,21 +292,22 @@@
      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
 -    - name: print test failures
 +    - run: ci/print-test-failures.sh
        if: failure() && env.FAILED_TEST_ARTIFACTS != ''
 -      shell: bash
 -      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}}