[arrow] branch master updated: ARROW-3976: [Ruby] Try to upgrade git to avoid errors caused by Homebrew on older git

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new c029b77  ARROW-3976: [Ruby] Try to upgrade git to avoid errors caused by Homebrew on older git
c029b77 is described below

commit c029b772f35958feb723cdddb67dcf04ae302013
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Wed Dec 12 08:13:36 2018 -0600

    ARROW-3976: [Ruby] Try to upgrade git to avoid errors caused by Homebrew on older git
    
    It seems that `brew update` can fail if the git version is too old, see https://github.com/Linuxbrew/brew/issues/820. Also adds retry logic
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    Author: Wes McKinney <we...@apache.org>
    
    Closes #3155 from wesm/ARROW-3976 and squashes the following commits:
    
    0c7964ba3 <Kouhei Sutou> Stop to use old Ruby
    7dce4f0a3 <Kouhei Sutou> travis_wait isn't available in custom shell script
    6d41e7196 <Kouhei Sutou> Make brew commands more robust
    05044892b <Wes McKinney> Incorporate code review
    8c0454fd7 <Wes McKinney> Try to upgrade git to avoid errors caused by Homebrew on older git, where --local argument is missing
---
 .travis.yml              |  1 -
 ci/travis_install_osx.sh | 24 ++++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42b1275..d1fc6db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -256,7 +256,6 @@ matrix:
     - ARROW_TRAVIS_PLASMA=1
     cache:
     addons:
-    rvm: 2.2
     before_script:
     - if [ $ARROW_CI_RUBY_AFFECTED != "1" ]; then exit; fi
     - $TRAVIS_BUILD_DIR/ci/travis_install_osx.sh
diff --git a/ci/travis_install_osx.sh b/ci/travis_install_osx.sh
index 47d6a63..6b6a4b2 100755
--- a/ci/travis_install_osx.sh
+++ b/ci/travis_install_osx.sh
@@ -23,13 +23,25 @@ set -e
 if [ "$ARROW_CI_RUBY_AFFECTED" = "1" ]; then
     brew_log_path=brew.log
     function run_brew() {
-        echo brew "$@" >> ${brew_log_path}
-        if ! gtimeout --signal=KILL 5m brew "$@" >> ${brew_log_path} 2>&1; then
-            cat ${brew_log_path}
-            rm ${brew_log_path}
-            false
-        fi
+        local i=0
+        local n_tries=3
+        while [[ $((i++)) < ${n_tries} ]]; do
+            echo "${i}: brew" "$@" >> ${brew_log_path}
+            if gtimeout --signal=KILL 9m brew "$@" >> ${brew_log_path} 2>&1; then
+                break
+            elif [[ ${i} == ${n_tries} ]]; then
+                cat ${brew_log_path}
+                rm ${brew_log_path}
+                false
+            fi
+        done
     }
+
+    # ARROW-3976 Old versions of git can cause failures when Homebrew prints a
+    # donation solicitation. Attempt to update git
+    git --version
+    run_brew upgrade git
+
     run_brew update
     run_brew upgrade python
     run_brew uninstall postgis