Merge branch 'ah/cleanups'

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

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 7f6acdd803c33bc43200804ecec5d99f6d404224..85a9d6b15cdc539e4995a05483cfcefa105c36ab 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -34,7 +34,7 @@ linux-clang|linux-gcc)
        popd
        ;;
 osx-clang|osx-gcc)
-       brew update >/dev/null
+       export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
        # Uncomment this if you want to run perf tests:
        # brew install gnu-time
        test -z "$BREW_INSTALL_PACKAGES" ||
@@ -49,11 +49,12 @@ osx-clang|osx-gcc)
        ;;
 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