Hi, Junio C Hamano wrote: > GitHub Actions CI started failing the pedantic (fedora) job at the > tip of 'master' few days ago, and the log claims the failure is due > to missing "awk". Even though we have seen a few topics to rewrite > Perl scriptlet, and I think at least one of them uses awk, but they > haven't hit 'master' yet, so it is puzzling why this started failing > all of a sudden. > > So here is a band-aid. I wouldn't be surprised if the base image > was updated without telling us. We have seen Ubuntu 20.04 base > image retired to cause CI failures as well. > > Almalinux does not even seem to have awk available as a package > (or it may be called differently, but we are not suffering from > the lack of awk on that platform anyway), so make sure we ask for > awk only on fedora. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > > * As the scheduled retirement of U20.04 image broke CI jobs running > for 'master', I started looking at making it pass again with the > minimum change, i.e. by merging dd/sparse-glibc-workaround and > js/ci-github-update-ubuntu topics. > > Then I somehow found that another job is broken. And this patch > seems to make it work. Not knowing how it got broken is > unsatisfactory, though. I can hazard a guess (or several)... It is likely that the image pointed to by the fedora:latest tag has moved from fedora 41 to 42, which was released today. The fedora 41 container images have awk installed while the fedora 42 images do not. That change is, I suspect, just part of reducing the size of the base container images. In both AlmaLinux and Fedora (as well as other RHEL derivatives/relatives), awk is provided by the gawk package. On Fedora, `dnf install awk` uses the package filelist data to determine that /usr/bin/awk is provided by gawk and installs gawk as a result. On AlmaLinux (8 & 9, by my quick testing), that is not the case and you'd need to use `dnf install gawk` or `dnf install '*bin/awk'` to get it installed. Though awk is included in the current AlmaLinux 8 and 9 images, so it isn't strictly needed. But it's probably better to be explicit that we need it installed, as a defense against some future change to the AlmaLinux container removing awk. Using gawk (or even '*bin/awk') would likely be clearer. That avoids relying on 1) a case statement to set an awk variable; and 2) the different behavior of older and newer releases of dnf with respect to the install argument matching on the names of binaries provided by the package. But that's certainly subjective. ;) > ci/install-dependencies.sh | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh > index 8700c0f292..a7c613ce4c 100755 > --- a/ci/install-dependencies.sh > +++ b/ci/install-dependencies.sh > @@ -30,8 +30,10 @@ alpine-*) > bash cvs gnupg perl-cgi perl-dbd-sqlite perl-io-tty >/dev/null > ;; > fedora-*|almalinux-*) > + awk= > + case "$distro" in fedora-*) awk=awk ;; esac > dnf -yq update >/dev/null && > - dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null > + dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel $awk >/dev/null > ;; > ubuntu-*|i386/ubuntu-*|debian-*) > # Required so that apt doesn't wait for user input on certain packages. -- Todd
