Sync with 2.32.7

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

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 5772081b6e55dac5cd6973df8609852036d9cfe9..be70b1a345e667ba406085e096bde6ddbc1fa864 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -5,7 +5,7 @@
 
 . ${0%/*}/lib.sh
 
-P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
+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
@@ -16,7 +16,7 @@ linux-clang|linux-gcc)
        sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
        sudo apt-get -q update
        sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
-               $UBUNTU_COMMON_PKGS
+               $UBUNTU_COMMON_PKGS $PYTHON_PACKAGE
        case "$jobname" in
        linux-gcc)
                sudo apt-get -q -y install gcc-8
@@ -44,13 +44,15 @@ osx-clang|osx-gcc)
        test -z "$BREW_INSTALL_PACKAGES" ||
        brew install $BREW_INSTALL_PACKAGES
        brew link --force gettext
-       brew install --cask --no-quarantine perforce || {
-               # Update the definitions and try again
-               cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
-               git -C "$cask_repo" pull --no-stat --ff-only &&
-               brew install --cask --no-quarantine perforce
-       } ||
-       brew install homebrew/cask/perforce
+       mkdir -p $HOME/bin
+       (
+               cd $HOME/bin
+               wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
+               tar -xf helix-core-server.tgz &&
+               sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true
+       )
+       PATH="$PATH:${HOME}/bin"
+       export PATH
        case "$jobname" in
        osx-gcc)
                brew install gcc@9
@@ -86,9 +88,9 @@ esac
 if type p4d >/dev/null && type p4 >/dev/null
 then
        echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
-       p4d -V | grep Rev.
+       p4d -V
        echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
-       p4 -V | grep Rev.
+       p4 -V
 fi
 if type git-lfs >/dev/null
 then