Skip to content

Commit 8972be0

Browse files
committed
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
2 parents 78c5de9 + d8b21a0 commit 8972be0

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,8 @@ jobs:
261261
- uses: actions/checkout@v3
262262
- run: ci/install-dependencies.sh
263263
- run: ci/run-build-and-tests.sh
264-
- name: print test failures
264+
- run: ci/print-test-failures.sh
265265
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
266-
shell: bash
267-
run: ci/print-test-failures.sh
268266
- name: Upload failed tests' directories
269267
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
270268
uses: actions/upload-artifact@v2
@@ -297,10 +295,8 @@ jobs:
297295
if: matrix.vector.jobname == 'linux32'
298296
- run: ci/install-docker-dependencies.sh
299297
- run: ci/run-build-and-tests.sh
300-
- name: print test failures
298+
- run: ci/print-test-failures.sh
301299
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
302-
shell: bash
303-
run: ci/print-test-failures.sh
304300
- name: Upload failed tests' directories
305301
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
306302
uses: actions/upload-artifact@v1

0 commit comments

Comments
 (0)