From: Phillip Wood <phillip.wood123@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2] CI: don't explicitly pick "bash" shell outside of Windows, fix regression
Date: Thu, 8 Dec 2022 10:09:38 +0000 [thread overview]
Message-ID: <271d275e-df40-76e5-3930-89ab63961fb2@dunelm.org.uk> (raw)
In-Reply-To: <patch-v2-1.1-c34fd06623a-20221207T120220Z-avarab@gmail.com>
Hi Ævar
On 07/12/2022 12:03, Ævar Arnfjörð Bjarmason wrote:
> 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.
What's the motivation for this part of the change (which is completely
unrelated to the choice of shell)? Having the test failures under "Print
test failures" makes it easy for new contributors to see where to click
to see the full output for test failures. Now they will appear under
"Run ci/print-test-failures.sh" which while not terrible is not as clear.
Best Wishes
Phillip
> 1. fc5a070f591 (Merge branch 'js/ci-github-workflow-markup', 2022-06-07)
> 2. 08dccc8fc1f (ci: make it easier to find failed tests' logs in the
> GitHub workflow, 2022-05-21)
> 3. 5aeb145780f (ci(github): bring back the 'print test failures' step,
> 2022-06-08)
> 4. d0d96b8280f (Merge branch 'js/ci-github-workflow-markup', 2022-06-17)
> 5. https://lore.kernel.org/git/220725.86sfmpneqp.gmgdl@evledraar.gmail.com/
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>
> I forgot the Signed-off-by in v1, sorry.
>
> Range-diff against v1:
> 1: 08dc682926a ! 1: c34fd06623a CI: don't explicitly pick "bash" shell outside of Windows, fix regression
> @@ Commit message
> 4. d0d96b8280f (Merge branch 'js/ci-github-workflow-markup', 2022-06-17)
> 5. https://lore.kernel.org/git/220725.86sfmpneqp.gmgdl@evledraar.gmail.com/
>
> + Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> +
> ## .github/workflows/main.yml ##
> @@ .github/workflows/main.yml: jobs:
> - uses: actions/checkout@v2
>
> .github/workflows/main.yml | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> index 9afacfa0b33..1a86f6a8ce1 100644
> --- a/.github/workflows/main.yml
> +++ b/.github/workflows/main.yml
> @@ -265,10 +265,8 @@ jobs:
> - uses: actions/checkout@v2
> - 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
> @@ -297,10 +295,8 @@ jobs:
> - uses: actions/checkout@v1
> - 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
next prev parent reply other threads:[~2022-12-08 10:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-07 3:15 [PATCH] CI: don't explicitly pick "bash" shell outside of Windows, fix regression Ævar Arnfjörð Bjarmason
2022-12-07 12:03 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2022-12-08 10:09 ` Phillip Wood [this message]
2022-12-08 12:20 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=271d275e-df40-76e5-3930-89ab63961fb2@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).