Skip to content

Commit 21bcb4a

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 11d3f1a commit 21bcb4a

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

ci/install-dependencies.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
P4WHENCE=https://cdist2.perforce.com/perforce/r21.2
99
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"
1310

1411
# Make sudo a no-op and execute the command directly when running as root.
1512
# While using sudo would be fine on most platforms when we are root already,
@@ -25,15 +22,21 @@ fi
2522
case "$distro" in
2623
ubuntu-*)
2724
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+
3032
mkdir --parents "$P4_PATH"
3133
pushd "$P4_PATH"
3234
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
3335
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
3436
chmod u+x p4d
3537
chmod u+x p4
3638
popd
39+
3740
mkdir --parents "$GIT_LFS_PATH"
3841
pushd "$GIT_LFS_PATH"
3942
wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
@@ -83,10 +86,6 @@ Documentation)
8386
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
8487
sudo gem install --version 1.5.8 asciidoctor
8588
;;
86-
linux-gcc-default)
87-
sudo apt-get -q update
88-
sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
89-
;;
9089
esac
9190

9291
if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1

0 commit comments

Comments
 (0)