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>

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 7dfd3e50edef7cc985a99819b19a8488afc7539d..fad53aac96961f7acca455d56ffec4d6e32b5f81 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -7,9 +7,6 @@
 
 P4WHENCE=https://cdist2.perforce.com/perforce/r21.2
 LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
-UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
- tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
- libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
 
 # Make sudo a no-op and execute the command directly when running as root.
 # While using sudo would be fine on most platforms when we are root already,
@@ -25,8 +22,13 @@ fi
 case "$distro" in
 ubuntu-*)
        sudo apt-get -q update
-       sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
-               $UBUNTU_COMMON_PKGS $CC_PACKAGE $PYTHON_PACKAGE
+       sudo apt-get -q -y install \
+               language-pack-is libsvn-perl apache2 \
+               make libssl-dev libcurl4-openssl-dev libexpat-dev \
+               tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
+               libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl \
+               $CC_PACKAGE $PYTHON_PACKAGE
+
        mkdir --parents "$P4_PATH"
        pushd "$P4_PATH"
                wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@ -34,6 +36,7 @@ ubuntu-*)
                chmod u+x p4d
                chmod u+x p4
        popd
+
        mkdir --parents "$GIT_LFS_PATH"
        pushd "$GIT_LFS_PATH"
                wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
@@ -83,10 +86,6 @@ Documentation)
        test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
        sudo gem install --version 1.5.8 asciidoctor
        ;;
-linux-gcc-default)
-       sudo apt-get -q update
-       sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
-       ;;
 esac
 
 if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1