]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/ci-musl-bash-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Dec 2022 05:01:05 +0000 (14:01 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Dec 2022 05:01:05 +0000 (14:01 +0900)
CI fix.

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

1  2 
.github/workflows/main.yml

index c265a529c5dc64031e7cd9cd801013d902db9afe,2ac20b47b74cba96be050928c2cbd808b21382a2..f0412e220af11e3fa211041877baef7f7eca6012
@@@ -262,13 -258,11 +262,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
      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