[arrow] branch master updated: ARROW-3258: [GLib] Fix CI failure on macOS

[ko...@apache.org]

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

kou 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 3c9dc76  ARROW-3258: [GLib] Fix CI failure on macOS
3c9dc76 is described below

commit 3c9dc76efcc40c9a51647976578c038d68a74d2e
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Tue Sep 18 16:28:28 2018 +0900

    ARROW-3258: [GLib] Fix CI failure on macOS
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #2580 from kou/ci-fix-macos and squashes the following commits:
    
    dac9b66c <Kouhei Sutou>  Fix CI failure on macOS
---
 c_glib/Brewfile          | 2 +-
 ci/travis_install_osx.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/c_glib/Brewfile b/c_glib/Brewfile
index 3549384..54738ef 100644
--- a/c_glib/Brewfile
+++ b/c_glib/Brewfile
@@ -17,7 +17,7 @@
 
 brew "autoconf-archive"
 brew "automake"
-brew "boost", args: ["1.66.0"]
+brew "boost"
 brew "ccache"
 brew "cmake"
 brew "git"
diff --git a/ci/travis_install_osx.sh b/ci/travis_install_osx.sh
index 271c5c1..83ca4a7 100755
--- a/ci/travis_install_osx.sh
+++ b/ci/travis_install_osx.sh
@@ -17,9 +17,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
+set -e
+
 if [ "$ARROW_CI_RUBY_AFFECTED" = "1" ]; then
     brew update
     brew upgrade python
-    brew upgrade hg
+    brew uninstall postgis
     brew bundle --file=$TRAVIS_BUILD_DIR/c_glib/Brewfile
 fi