Revert "Use travis_wait for each brew call instead of wrapping the entire install script with it, otherwise there's no indication of progress when watching the log of a running build."

travis_wait is not available inside the install script.

This reverts commit d62daefc44809a69edd85bef26a17ac3b43aa38f.

1 files changed, 19 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 9f60e51..e4ad672 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ matrix:
   - compiler: clang
     env: COMPILER=clang-default STL=libc++ TEST=DebugPlain
     install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
-      extras/scripts/travis_ci_install_osx.sh
+      travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
@@ -172,59 +172,64 @@ matrix:
       export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugPlain
   - compiler: gcc
     env: COMPILER=gcc-6 TEST=ReleasePlain
-    install: export OS=osx; export COMPILER='gcc-6'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='gcc-6'; travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='gcc-6'; extras/scripts/postsubmit.sh ReleasePlain
   - compiler: gcc
     env: COMPILER=gcc-6 TEST=DebugPlain
-    install: export OS=osx; export COMPILER='gcc-6'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='gcc-6'; travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='gcc-6'; extras/scripts/postsubmit.sh DebugPlain
   - compiler: gcc
     env: COMPILER=gcc-9 TEST=ReleasePlainNoPch
-    install: export OS=osx; export COMPILER='gcc-9'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='gcc-9'; travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='gcc-9'; extras/scripts/postsubmit.sh ReleasePlainNoPch
   - compiler: gcc
     env: COMPILER=gcc-9 TEST=DebugPlainNoPch
-    install: export OS=osx; export COMPILER='gcc-9'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='gcc-9'; travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='gcc-9'; extras/scripts/postsubmit.sh DebugPlainNoPch
   - compiler: clang
     env: COMPILER=clang-6.0 STL=libc++ TEST=ReleasePlain
-    install: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; travis_wait
+      extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; extras/scripts/postsubmit.sh
       ReleasePlain
   - compiler: clang
     env: COMPILER=clang-6.0 STL=libc++ TEST=DebugAsanUbsan
-    install: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; travis_wait
+      extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; extras/scripts/postsubmit.sh
       DebugAsanUbsan
   - compiler: clang
     env: COMPILER=clang-8.0 STL=libc++ TEST=ReleasePlainNoPch
-    install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; travis_wait
+      extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/postsubmit.sh
       ReleasePlainNoPch
   - compiler: clang
     env: COMPILER=clang-8.0 STL=libc++ TEST=DebugAsanUbsanNoPch
-    install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; travis_wait
+      extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/postsubmit.sh
       DebugAsanUbsanNoPch
   - compiler: clang
     env: COMPILER=clang-8.0 STL=libc++ TEST=DebugPlainNoPch
-    install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/travis_ci_install_osx.sh
+    install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; travis_wait
+      extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/postsubmit.sh
@@ -232,7 +237,7 @@ matrix:
   - compiler: clang
     env: COMPILER=clang-default STL=libc++ TEST=ReleasePlain
     install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
-      extras/scripts/travis_ci_install_osx.sh
+      travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode9.4
     script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
@@ -240,7 +245,7 @@ matrix:
   - compiler: clang
     env: COMPILER=clang-default STL=libc++ TEST=DebugAsanUbsan
     install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
-      extras/scripts/travis_ci_install_osx.sh
+      travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode9.4
     script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
@@ -248,7 +253,7 @@ matrix:
   - compiler: clang
     env: COMPILER=clang-default STL=libc++ TEST=ReleasePlain
     install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
-      extras/scripts/travis_ci_install_osx.sh
+      travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
@@ -256,7 +261,7 @@ matrix:
   - compiler: clang
     env: COMPILER=clang-default STL=libc++ TEST=DebugAsanUbsan
     install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
-      extras/scripts/travis_ci_install_osx.sh
+      travis_wait extras/scripts/travis_ci_install_osx.sh
     os: osx
     osx_image: xcode11.4
     script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh