You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/09/17 17:46:08 UTC
[6/6] arrow git commit: ARROW-1529: [GLib] Use Xcode 8.3 on Travis CI
ARROW-1529: [GLib] Use Xcode 8.3 on Travis CI
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #1092 from kou/glib-travis-macos and squashes the following commits:
291808b2 [Kouhei Sutou] [GLib] Use Xcode 8.3 on Travis CI
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/d0b0b741
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/d0b0b741
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/d0b0b741
Branch: refs/heads/master
Commit: d0b0b74181fd94c22996014b9a13e953ed7bbadd
Parents: 97f9029
Author: Kouhei Sutou <ko...@clear-code.com>
Authored: Wed Sep 13 09:09:38 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sun Sep 17 13:45:20 2017 -0400
----------------------------------------------------------------------
.travis.yml | 2 +-
ci/travis_before_script_c_glib.sh | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/d0b0b741/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c4a8f41..f6f6400 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,7 +128,7 @@ matrix:
script:
- $TRAVIS_BUILD_DIR/ci/travis_script_c_glib.sh
- compiler: clang
- osx_image: xcode6.4
+ osx_image: xcode8.3
os: osx
cache:
addons:
http://git-wip-us.apache.org/repos/asf/arrow/blob/d0b0b741/ci/travis_before_script_c_glib.sh
----------------------------------------------------------------------
diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh
index 6799ae4..533c892 100755
--- a/ci/travis_before_script_c_glib.sh
+++ b/ci/travis_before_script_c_glib.sh
@@ -23,7 +23,9 @@ source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
if [ $TRAVIS_OS_NAME == "osx" ]; then
brew install gtk-doc autoconf-archive gobject-introspection
- brew upgrade git cmake wget libtool
+ brew upgrade git cmake
+ brew outdated || brew upgrade wget
+ brew outdated || brew upgrade libtool
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig
else
@@ -36,6 +38,7 @@ gem install test-unit gobject-introspection
if [ $TRAVIS_OS_NAME == "osx" ]; then
brew install lua
+ sudo env PKG_CONFIG_PATH=$PKG_CONFIG_PATH luarocks install lgi
else
git clone \
--quiet \
@@ -47,8 +50,8 @@ else
echo "yes" | ./install.sh > /dev/null
. ~/torch/install/bin/torch-activate
popd
+ luarocks install lgi
fi
-luarocks install lgi
go get github.com/linuxdeepin/go-gir-generator || :
pushd $GOPATH/src/github.com/linuxdeepin/go-gir-generator
@@ -74,6 +77,12 @@ pushd $ARROW_C_GLIB_DIR
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_CPP_INSTALL/lib/pkgconfig
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib
+if [ $TRAVIS_OS_NAME == "osx" ]; then
+ install_name_tool \
+ -id $ARROW_CPP_INSTALL/lib/libarrow.dylib \
+ $ARROW_CPP_INSTALL/lib/libarrow.dylib
+fi
+
CONFIGURE_OPTIONS="--prefix=$ARROW_C_GLIB_INSTALL"
if [ $TRAVIS_OS_NAME != "osx" ]; then
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-gtk-doc"