Skip to content

Commit a81aefb

Browse files
kouxhochy
authored andcommitted
ARROW-1082: [GLib] Add CI on macOS
Author: Kouhei Sutou <kou@clear-code.com> Closes #722 from kou/glib-travis-macos and squashes the following commits: 1a08aa0 [Kouhei Sutou] [GLib] Don't run Torch example on macOS 651f9ff [Kouhei Sutou] [GLib] Add CI on macOS
1 parent 931a877 commit a81aefb

File tree

4 files changed

+56
-21
lines changed

4 files changed

+56
-21
lines changed

.travis.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ addons:
1717
- gtk-doc-tools
1818
- autoconf-archive
1919
- libgirepository1.0-dev
20-
- gir1.2-gudev-1.0
2120
services:
2221
- docker
2322

@@ -91,6 +90,17 @@ matrix:
9190
- $TRAVIS_BUILD_DIR/ci/travis_before_script_c_glib.sh
9291
script:
9392
- $TRAVIS_BUILD_DIR/ci/travis_script_c_glib.sh
93+
- compiler: clang
94+
osx_image: xcode6.4
95+
os: osx
96+
cache:
97+
addons:
98+
rvm: 2.2
99+
before_script:
100+
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh --only-library
101+
- $TRAVIS_BUILD_DIR/ci/travis_before_script_c_glib.sh
102+
script:
103+
- $TRAVIS_BUILD_DIR/ci/travis_script_c_glib.sh
94104

95105
before_install:
96106
- ulimit -c unlimited -S

ci/travis_before_script_c_glib.sh

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,38 @@ source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
1919

2020
if [ $TRAVIS_OS_NAME == "osx" ]; then
2121
brew install gtk-doc autoconf-archive gobject-introspection
22+
brew upgrade git cmake wget libtool
23+
24+
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig
2225
fi
2326

24-
gem install gobject-introspection
25-
26-
git clone \
27-
--quiet \
28-
--depth 1 \
29-
--recursive \
30-
https://github.com/torch/distro.git ~/torch
31-
pushd ~/torch
32-
./install-deps > /dev/null
33-
echo "yes" | ./install.sh > /dev/null
34-
. ~/torch/install/bin/torch-activate
35-
popd
27+
gem install test-unit gobject-introspection
28+
29+
if [ $TRAVIS_OS_NAME == "osx" ]; then
30+
brew install lua
31+
else
32+
git clone \
33+
--quiet \
34+
--depth 1 \
35+
--recursive \
36+
https://github.com/torch/distro.git ~/torch
37+
pushd ~/torch
38+
./install-deps > /dev/null
39+
echo "yes" | ./install.sh > /dev/null
40+
. ~/torch/install/bin/torch-activate
41+
popd
42+
fi
3643
luarocks install lgi
3744

3845
go get github.com/linuxdeepin/go-gir-generator || :
3946
pushd $GOPATH/src/github.com/linuxdeepin/go-gir-generator
47+
mv Makefile{,.orig}
48+
sed -e 's/ gudev-1.0//' Makefile.orig > Makefile
49+
mkdir -p out/src/gir/gudev-1.0
4050
make build copyfile
4151
mkdir -p $GOPATH/bin/
4252
cp -a out/gir-generator $GOPATH/bin/
43-
cp -a out/src/gir/ $GOPATH/src/
53+
cp -a out/src/gir/ $GOPATH/src/gir/
4454
popd
4555

4656
pushd $ARROW_C_GLIB_DIR
@@ -50,7 +60,11 @@ pushd $ARROW_C_GLIB_DIR
5060
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_CPP_INSTALL/lib/pkgconfig
5161
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib
5262

53-
./configure --prefix=${ARROW_C_GLIB_INSTALL} --enable-gtk-doc
63+
CONFIGURE_OPTIONS="--prefix=$ARROW_C_GLIB_INSTALL"
64+
if [ $TRAVIS_OS_NAME != "osx" ]; then
65+
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-gtk-doc"
66+
fi
67+
./configure $CONFIGURE_OPTIONS
5468

5569
make -j4
5670
make install

ci/travis_env_common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ export ARROW_INTEGRATION_DIR=$TRAVIS_BUILD_DIR/integration
2626
export ARROW_CPP_INSTALL=$TRAVIS_BUILD_DIR/cpp-install
2727
export ARROW_CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build
2828
export ARROW_C_GLIB_INSTALL=$TRAVIS_BUILD_DIR/c-glib-install
29+
30+
if [ $TRAVIS_OS_NAME == "osx" ]; then
31+
export GOPATH=$TRAVIS_BUILD_DIR/gopath
32+
fi

ci/travis_script_c_glib.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,19 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_CPP_INSTALL/lib/pkgconfig
2727
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_C_GLIB_INSTALL/lib/pkgconfig
2828

2929
pushd example/lua
30-
. ~/torch/install/bin/torch-activate
31-
luajit write-batch.lua
32-
luajit read-batch.lua
33-
luajit write-stream.lua
34-
luajit read-stream.lua
35-
luajit stream-to-torch-tensor.lua
30+
if [ $TRAVIS_OS_NAME == "osx" ]; then
31+
lua write-batch.lua
32+
lua read-batch.lua
33+
lua write-stream.lua
34+
lua read-stream.lua
35+
else
36+
. ~/torch/install/bin/torch-activate
37+
luajit write-batch.lua
38+
luajit read-batch.lua
39+
luajit write-stream.lua
40+
luajit read-stream.lua
41+
luajit stream-to-torch-tensor.lua
42+
fi
3643
popd
3744

3845
pushd example/go

0 commit comments

Comments
 (0)