Skip to content

Commit d8b21a0

Browse files
avargitster
authored andcommitted
CI: don't explicitly pick "bash" shell outside of Windows, fix regression
When the "js/ci-github-workflow-markup" topic was originally merged in [1] it included a change to get rid of the "ci/print-test-failures.sh" step[2]. This was then brought back in [3] as part of a fix-up patches on top[4]. The problem was that [3] was not a revert of the relevant parts of [2], but rather copy/pasted the "ci/print-test-failures.sh" step that was present for the Windows job to all "ci/print-test-failures.sh" steps. The Windows steps specified "shell: bash", but the non-Windows ones did not. This broke the "ci/print/test-failures.sh" step for the "linux-musl" job, where we don't have a "bash" shell, just a "/bin/sh" (a "dash"). This breakage was reported at the time[5], but hadn't been fixed. It would be sufficient to change this only for "linux-musl", but let's change this for both "regular" and "dockerized" to omit the "shell" line entirely, as we did before [2]. Let's also change undo the "name" change that [3] made while copy/pasting the "print test failures" step for the Windows job. These steps are now the same as they were before [2], except that the "if" includes the "env.FAILED_TEST_ARTIFACTS" test. 1. fc5a070 (Merge branch 'js/ci-github-workflow-markup', 2022-06-07) 2. 08dccc8 (ci: make it easier to find failed tests' logs in the GitHub workflow, 2022-05-21) 3. 5aeb145 (ci(github): bring back the 'print test failures' step, 2022-06-08) 4. d0d96b8 (Merge branch 'js/ci-github-workflow-markup', 2022-06-17) 5. https://lore.kernel.org/git/[email protected]/ Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e7e5c6f commit d8b21a0

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@v2
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
@@ -294,10 +292,8 @@ jobs:
294292
- uses: actions/checkout@v1
295293
- run: ci/install-docker-dependencies.sh
296294
- run: ci/run-build-and-tests.sh
297-
- name: print test failures
295+
- run: ci/print-test-failures.sh
298296
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
299-
shell: bash
300-
run: ci/print-test-failures.sh
301297
- name: Upload failed tests' directories
302298
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
303299
uses: actions/upload-artifact@v1

0 commit comments

Comments
 (0)