ci: reorder definitions for grouping functions

We define a set of grouping functions that are used to group together
output in our CI, where these groups then end up as collapsible sections
in the respective pipeline platform. The way these functions are defined
is not easily extensible though as we have an up front check for the CI
_not_ being GitHub Actions, where we define the non-stub logic in the
else branch.

Reorder the conditional branches such that we explicitly handle GitHub
Actions.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2023-11-09 09:05:25 +01:00
committed by Junio C Hamano
parent 43c8a30d15
commit a4761b605c

View File

@ -1,16 +1,7 @@
# Library of functions shared by all CI scripts
if test true != "$GITHUB_ACTIONS"
if test true = "$GITHUB_ACTIONS"
then
begin_group () { :; }
end_group () { :; }
group () {
shift
"$@"
}
set -x
else
begin_group () {
need_to_end_group=t
echo "::group::$1" >&2
@ -42,6 +33,15 @@ else
}
begin_group "CI setup"
else
begin_group () { :; }
end_group () { :; }
group () {
shift
"$@"
}
set -x
fi
# Set 'exit on error' for all CI scripts to let the caller know that