Skip to content

ARROW-1529: [GLib] Use Xcode 8.3 on Travis CI #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kou wants to merge 1 commit into from
Closed

ARROW-1529: [GLib] Use Xcode 8.3 on Travis CI #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 11 additions & 2 deletions ci/travis_before_script_c_glib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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
Expand All @@ -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"
Expand Down