Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,18 @@ matrix:
script:
- if [ $ARROW_CI_C_GLIB_AFFECTED = "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_c_glib.sh; fi
- $TRAVIS_BUILD_DIR/ci/travis_script_ruby.sh
- name: "[OS X] C++ & GLib & Ruby w/ XCode 8.3 & homebrew"
- name: "[OS X] C++ & GLib & Ruby w/ XCode 10.2 & Homebrew"
compiler: clang
osx_image: xcode8.3
osx_image: xcode10.2
os: osx
env:
- ARROW_TRAVIS_ORC=1
- ARROW_TRAVIS_FLIGHT=1
- ARROW_TRAVIS_GANDIVA=1
- ARROW_TRAVIS_ORC=1
- ARROW_TRAVIS_PARQUET=1
- ARROW_TRAVIS_PLASMA=1
- ARROW_TRAVIS_PYTHON=1
- ARROW_TRAVIS_VERBOSE=1
cache:
addons:
before_script:
Expand Down
14 changes: 14 additions & 0 deletions ci/travis_before_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
# Make sure the toolchain linker (from binutils package) is picked up by clang
ARROW_CXXFLAGS="$ARROW_CXXFLAGS -B$CPP_TOOLCHAIN/bin"
fi
export TRAVIS_MAKE=ninja
elif [ "$using_homebrew" = "yes" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -GNinja"
export TRAVIS_MAKE=ninja
else
export TRAVIS_MAKE=make
fi

if [ "$ARROW_TRAVIS_FLIGHT" == "1" ]; then
Expand All @@ -106,6 +112,14 @@ if [ "$ARROW_TRAVIS_ORC" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_ORC=ON"
fi

if [ "$ARROW_TRAVIS_PYTHON" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_PYTHON=ON"
if [ "$using_homebrew" == "yes" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS \
-DPYTHON_EXECUTABLE=$(brew --prefix python)/bin/python3"
fi
fi

if [ "$ARROW_TRAVIS_PARQUET" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS \
-DARROW_PARQUET=ON \
Expand Down
4 changes: 0 additions & 4 deletions ci/travis_env_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ export ARROW_BUILD_WARNING_LEVEL=${ARROW_BUILD_WARNING_LEVEL:=Production}
if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
# C++ toolchain
export CPP_TOOLCHAIN=$TRAVIS_BUILD_DIR/cpp-toolchain

export TRAVIS_MAKE=ninja
else
export TRAVIS_MAKE=make
fi

if [ $TRAVIS_OS_NAME == "osx" ]; then
Expand Down
44 changes: 18 additions & 26 deletions ci/travis_install_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,23 @@ set -x
set -e

if [ "$ARROW_CI_RUBY_AFFECTED" = "1" ]; then
brew_log_path=brew.log
function run_brew() {
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
}
brew_log_path=brew.log
function run_brew() {
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
run_brew bundle --file=$TRAVIS_BUILD_DIR/cpp/Brewfile --verbose
run_brew bundle --file=$TRAVIS_BUILD_DIR/c_glib/Brewfile --verbose
rm ${brew_log_path}
run_brew bundle --file=$TRAVIS_BUILD_DIR/cpp/Brewfile --verbose
run_brew bundle --file=$TRAVIS_BUILD_DIR/c_glib/Brewfile --verbose
rm ${brew_log_path}
fi
38 changes: 22 additions & 16 deletions ci/travis_install_osx_sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,28 @@

set -ex

export MACOSX_DEPLOYMENT_TARGET="10.9"
export CONDA_BUILD_SYSROOT="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk"
if [ ${using_homebrew} = "yes" ]; then
sudo \
installer \
-pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg \
-target /
else
export MACOSX_DEPLOYMENT_TARGET="10.9"
export CONDA_BUILD_SYSROOT="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk"

if [[ ! -d ${CONDA_BUILD_SYSROOT} || "$OSX_FORCE_SDK_DOWNLOAD" == "1" ]]; then
echo "downloading ${macosx_deployment_target} sdk"
curl -L -O https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk.tar.xz
tar -xf MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk.tar.xz -C "$(dirname "$CONDA_BUILD_SYSROOT")"
# set minimum sdk version to our target
plutil -replace MinimumSDKVersion -string ${MACOSX_DEPLOYMENT_TARGET} $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
plutil -replace DTSDKName -string macosx${MACOSX_DEPLOYMENT_TARGET}internal $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
fi
if [[ ! -d ${CONDA_BUILD_SYSROOT} || "$OSX_FORCE_SDK_DOWNLOAD" == "1" ]]; then
echo "downloading ${macosx_deployment_target} sdk"
curl -L -O https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk.tar.xz
tar -xf MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk.tar.xz -C "$(dirname "$CONDA_BUILD_SYSROOT")"
# set minimum sdk version to our target
plutil -replace MinimumSDKVersion -string ${MACOSX_DEPLOYMENT_TARGET} $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
plutil -replace DTSDKName -string macosx${MACOSX_DEPLOYMENT_TARGET}internal $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
fi

if [ -d "${CONDA_BUILD_SYSROOT}" ]; then
echo "Found CONDA_BUILD_SYSROOT: ${CONDA_BUILD_SYSROOT}"
else
echo "Missing CONDA_BUILD_SYSROOT: ${CONDA_BUILD_SYSROOT}"
exit 1
if [ -d "${CONDA_BUILD_SYSROOT}" ]; then
echo "Found CONDA_BUILD_SYSROOT: ${CONDA_BUILD_SYSROOT}"
else
echo "Missing CONDA_BUILD_SYSROOT: ${CONDA_BUILD_SYSROOT}"
exit 1
fi
fi

12 changes: 12 additions & 0 deletions cpp/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,24 @@

brew "automake"
brew "boost"
brew "brotli"
brew "ccache"
brew "cmake"
brew "double-conversion"
brew "flatbuffers"
brew "git"
brew "glog"
brew "grpc"
brew "llvm@7"
brew "lz4"
brew "ninja"
brew "numpy"
brew "openssl"
brew "protobuf"
brew "python"
brew "rapidjson"
brew "re2"
brew "snappy"
brew "thrift"
brew "wget"
brew "zstd"