ci: drop duplicate package installation for "linux-gcc-default"
The "linux-gcc-default" job installs common Ubuntu packages. This is already done in the distro-specific switch, so we basically duplicate the effort here. Drop the duplicate package installations and inline the variable that contains those common packages. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Apr 12, 2024 at 06:44 UTC
21bcb4a6023c70b1359ba138dedcf37939be5eaa
1 file changed
+8
-9
ci/install-dependencies.sh
+8
-9
@@ -7,9 +7,6 @@
7
8
P4WHENCE=https://cdist2.perforce.com/perforce/r21.2
9
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
10
-UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
11
- tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
12
- libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
10
11
# Make sudo a no-op and execute the command directly when running as root.
12
# While using sudo would be fine on most platforms when we are root already,
@@ -25,8 +22,13 @@ fi
22
case "$distro" in
23
ubuntu-*)
24
sudo apt-get -q update
28
- sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
29
- $UBUNTU_COMMON_PKGS $CC_PACKAGE $PYTHON_PACKAGE
25
+ sudo apt-get -q -y install \
26
+ language-pack-is libsvn-perl apache2 \
27
+ make libssl-dev libcurl4-openssl-dev libexpat-dev \
28
+ tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
29
+ libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl \
30
+ $CC_PACKAGE $PYTHON_PACKAGE
31
+
32
mkdir --parents "$P4_PATH"
33
pushd "$P4_PATH"
34
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@ -34,6 +36,7 @@ ubuntu-*)
36
chmod u+x p4d
37
chmod u+x p4
38
popd
39
+
40
mkdir --parents "$GIT_LFS_PATH"
41
pushd "$GIT_LFS_PATH"
42
wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
@@ -83,10 +86,6 @@ Documentation)
86
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
87
sudo gem install --version 1.5.8 asciidoctor
88
;;
86
-linux-gcc-default)
87
- sudo apt-get -q update
88
- sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
89
- ;;
89
esac
90
91
if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1