Merge branch 'en/merge-recursive-directory-rename-fixes'

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

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 8cc72503cb768573bc6d284eb57910ba6ca5a5cb..4e64a191120dd1091dc43f69122a64dac818ba7d 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -40,20 +40,27 @@ osx-clang|osx-gcc)
        test -z "$BREW_INSTALL_PACKAGES" ||
        brew install $BREW_INSTALL_PACKAGES
        brew link --force gettext
+       brew cask install perforce || {
+               # Update the definitions and try again
+               git -C "$(brew --repository)"/Library/Taps/homebrew/homebrew-cask pull &&
+               brew cask install perforce
+       } ||
        brew install caskroom/cask/perforce
        case "$jobname" in
        osx-gcc)
+               brew link gcc ||
                brew link gcc@8
                ;;
        esac
        ;;
 StaticAnalysis)
        sudo apt-get -q update
-       sudo apt-get -q -y install coccinelle
+       sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
+               libexpat-dev gettext
        ;;
 Documentation)
        sudo apt-get -q update
-       sudo apt-get -q -y install asciidoc xmlto
+       sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns
 
        test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
        gem install --version 1.5.8 asciidoctor