From: Patrick Steinhardt <ps@pks.im>
Date: Thu, 12 Dec 2024 06:47:17 +0000 (+0100)
Subject: ci/lib: fix "CI setup" sections with GitLab CI
X-Git-Tag: v2.48.0-rc1~22^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6b43f663eb252deb28cfff79e1ccdefed87c971;p=thirdparty%2Fgit.git

ci/lib: fix "CI setup" sections with GitLab CI

Whenever we source "ci/lib.sh" we wrap the directives in a separate
group so that they can easily be collapsed in the web UI. And as we
source the script multiple times during a single CI run we thus end up
with the same section name reused multiple times, as well.

This is broken on GitLab CI though, where reusing the same group name is
not supported. The consequence is that only the last of these sections
can be collapsed.

Fix this issue by including the name of the sourcing script in the
group's name.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/ci/lib.sh b/ci/lib.sh
index 803f56bc82..63c42fe93a 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -57,7 +57,7 @@ group () {
 	return $res
 }
 
-begin_group "CI setup"
+begin_group "CI setup via $(basename $0)"
 
 # Set 'exit on error' for all CI scripts to let the caller know that
 # something went wrong.
@@ -388,5 +388,5 @@ esac
 
 MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
 
-end_group "CI setup"
+end_group "CI setup via $(basename $0)"
 set -x