From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Dec 2022 05:02:09 +0000 (+0900)
Subject: Merge branch 'ab/ci-musl-bash-fix' into maint-2.38
X-Git-Tag: v2.38.2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8972be02520e0b02c864c3c8fa7ed2271043f0fc;p=thirdparty%2Fgit.git

Merge branch 'ab/ci-musl-bash-fix' into maint-2.38

CI fix.

* ab/ci-musl-bash-fix:
  CI: don't explicitly pick "bash" shell outside of Windows, fix regression
---

8972be02520e0b02c864c3c8fa7ed2271043f0fc
diff --cc .github/workflows/main.yml
index 5262823eb1,2ac20b47b7..4754c0719a
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -258,13 -258,11 +258,11 @@@ 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
@@@ -291,16 -289,11 +289,14 @@@
      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 != ''
        uses: actions/upload-artifact@v1