Sync with 2.34.8

[thirdparty/git.git] / ci / install-dependencies.sh

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index e6e283e3233d80a493a71a801b2f14f861b06bba..df6c61713cc6771ddabc9ab7d425e4dab161feda 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -11,18 +11,11 @@ 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"
 
-case "$jobname" in
-linux-clang|linux-gcc|linux-leaks)
-       sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+case "$runs_on_pool" in
+ubuntu-*)
        sudo apt-get -q update
        sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
                $UBUNTU_COMMON_PKGS $PYTHON_PACKAGE
-       case "$jobname" in
-       linux-gcc)
-               sudo apt-get -q -y install gcc-8
-               ;;
-       esac
-
        mkdir --parents "$P4_PATH"
        pushd "$P4_PATH"
                wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@ -37,7 +30,7 @@ linux-clang|linux-gcc|linux-leaks)
                cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
        popd
        ;;
-osx-clang|osx-gcc)
+macos-latest)
        export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
        # Uncomment this if you want to run perf tests:
        # brew install gnu-time
@@ -53,15 +46,17 @@ osx-clang|osx-gcc)
        )
        PATH="$PATH:${HOME}/bin"
        export PATH
-       case "$jobname" in
-       osx-gcc)
-               brew install gcc@9
-               # Just in case the image is updated to contain gcc@9
-               # pre-installed but not linked.
-               brew link gcc@9
-               ;;
-       esac
+
+       if test -n "$CC_PACKAGE"
+       then
+               BREW_PACKAGE=${CC_PACKAGE/-/@}
+               brew install "$BREW_PACKAGE"
+               brew link "$BREW_PACKAGE"
+       fi
        ;;
+esac
+
+case "$jobname" in
 StaticAnalysis)
        sudo apt-get -q update
        sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
@@ -79,7 +74,7 @@ Documentation)
        test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
        sudo gem install --version 1.5.8 asciidoctor
        ;;
-linux-gcc-default|linux-gcc-4.8)
+linux-gcc-default)
        sudo apt-get -q update
        sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
        ;;