Merge branch 'jt/fetch-no-update-shallow-in-proto-v2'

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index bcdcc715924c53bbcf1418b7ddeee426c94468b8..52a44c690a7a38850e77eb1525e6f8c56e782369 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -34,13 +34,18 @@ linux-clang|linux-gcc)
        popd
        ;;
 osx-clang|osx-gcc)
-       brew update --quiet
+       brew update >/dev/null
        # Uncomment this if you want to run perf tests:
        # brew install gnu-time
        test -z "$BREW_INSTALL_PACKAGES" ||
        brew install $BREW_INSTALL_PACKAGES
        brew link --force gettext
        brew install caskroom/cask/perforce
+       case "$jobname" in
+       osx-gcc)
+               brew link gcc@8
+               ;;
+       esac
        ;;
 StaticAnalysis)
        sudo apt-get -q update
@@ -49,6 +54,9 @@ StaticAnalysis)
 Documentation)
        sudo apt-get -q update
        sudo apt-get -q -y install asciidoc xmlto
+
+       test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
+       gem install --version 1.5.8 asciidoctor
        ;;
 esac