diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-06 14:56:44 -0800 |
| commit | 2bf3c7fab19a59cde3a3dda9398075f0fe8d57c1 (patch) | |
| tree | df5199be6ce3e4211e9bb71a18b798cbe6366b39 /ci/install-dependencies.sh | |
| parent | bc204b742735ae06f65bb20291c95985c9633b7f (diff) | |
| parent | e39e332e5043d7e8f48fbfc91c3bd6d45a52cb7b (diff) | |
| download | git-2bf3c7fab19a59cde3a3dda9398075f0fe8d57c1.tar.gz | |
Merge branch 'ps/ci-misc-updates'
CI updates (containerization, dropping stale ones, etc.).
* ps/ci-misc-updates:
ci: remove stale code for Azure Pipelines
ci: use latest Ubuntu release
ci: stop special-casing for Ubuntu 16.04
gitlab-ci: add linux32 job testing against i386
gitlab-ci: remove the "linux-old" job
github: simplify computation of the job's distro
github: convert all Linux jobs to be containerized
github: adapt containerized jobs to be rootless
t7422: fix flaky test caused by buffered stdout
t0060: fix EBUSY in MinGW when setting up runtime prefix
Diffstat (limited to 'ci/install-dependencies.sh')
| -rwxr-xr-x | ci/install-dependencies.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d1cb9fa878..d5a959e25f 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -31,9 +31,9 @@ alpine-*) ;; fedora-*|almalinux-*) dnf -yq update >/dev/null && - dnf -yq install 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 >/dev/null ;; -ubuntu-*|ubuntu32-*|debian-*) +ubuntu-*|i386/ubuntu-*|debian-*) # Required so that apt doesn't wait for user input on certain packages. export DEBIAN_FRONTEND=noninteractive @@ -42,7 +42,7 @@ ubuntu-*|ubuntu32-*|debian-*) SVN='libsvn-perl subversion' LANGUAGES='language-pack-is' ;; - ubuntu32-*) + i386/ubuntu-*) SVN= LANGUAGES='language-pack-is' ;; |