From: Colin Stagner <ask+git@howdoi.land>
To: Patrick Steinhardt <ps@pks.im>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Colin Stagner <ask+git@howdoi.land>
Subject: Re: [PATCH] ci: avoid ubuntu:rolling in most jobs for now
Date: Fri, 6 Feb 2026 22:27:03 -0600 [thread overview]
Message-ID: <20260207042703.1180704-1-ask+git@howdoi.land> (raw)
In-Reply-To: <aYWaytvnR8wOdc1s@pks.im>
On 2/6/26 01:39, Patrick Steinhardt wrote:
> On 2/5/26 15:55, Collin Funk wrote:
>> If you would prefer to keep usingubuntu:rolling, you can do something
>> like this:
>>
>> $ podman run --rm -itubuntu:25.10
>> $ dirname --version
>> dirname (uutils coreutils) 0.2.2
>> $ apt-get upgrade -y; apt-get update -y;
>> [...]
>> $ apt-get install -y coreutils-from-gnu coreutils-from-uutils- \
>> --allow-remove-essential
>> [...]
>> $ dirname --version | head -n 1
>> dirname (GNU coreutils) 9.5
>
> ideally we'd do a similar workaround to the sudo.ws workaround
> we have in "ci/install-dependencies.sh" so that we only disable the
> pieces that _don't_ work.
The ubuntu:rolling image still has GNU coreutils installed, but all
the command names are prefixed with "gnu". This approach replaces
only `dirname`. Feel free to adapt or discard as you like---this
isn't my CI!
Colin
-- >8 --
Subject: [PATCH] ci: ubuntu: use GNU coreutils for dirname
The uutils version of `dirname` has output that is inconsistent
with GNU coreutils. Prefer the GNU implementation of this command.
Signed-off-by: Colin Stagner <ask+git@howdoi.land>
---
ci/install-dependencies.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 6ee8216a05..617b90cbc9 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -71,16 +71,27 @@ ubuntu-*|i386/ubuntu-*|debian-*)
# sudo(1) or sudo-rs(1), with the latter being the default. The problem
# is that it does not support `--preserve-env` though, which we rely on
# in our CI. We thus revert back to the C implementation.
if test -f /etc/alternatives/sudo
then
sudo update-alternatives --set sudo /usr/bin/sudo.ws
fi
+ # on uutils v0.2.2 from rust-coreutils,
+ # dirname "foo/."
+ # outputs "." instead of "foo" like it should.
+ # Use GNU coreutils to provide dirname instead.
+ #
+ # See <https://github.com/uutils/coreutils/issues/10508>.
+ if test -x /usr/bin/gnudirname
+ then
+ ln -sfT /usr/bin/gnudirname /usr/bin/dirname
+ fi
+
case "$distro" in
ubuntu-*)
mkdir --parents "$CUSTOM_PATH"
wget --quiet --directory-prefix="$CUSTOM_PATH" \
"$P4WHENCE/bin.linux26x86_64/p4d" \
"$P4WHENCE/bin.linux26x86_64/p4" &&
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" || {
base-commit: 3e0db84c88c57e70ac8be8c196dfa92c5d656fbc
--
2.43.0
next prev parent reply other threads:[~2026-02-07 4:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-05 21:26 [PATCH] ci: avoid ubuntu:rolling in most jobs for now Junio C Hamano
2026-02-05 21:55 ` Collin Funk
2026-02-06 7:39 ` Patrick Steinhardt
2026-02-07 4:27 ` Colin Stagner [this message]
2026-02-07 4:56 ` Junio C Hamano
2026-02-07 5:35 ` Colin Stagner
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260207042703.1180704-1-ask+git@howdoi.land \
--to=ask+git@howdoi.land \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox