diff --git a/dev/tasks/conda-recipes/azure.linux.yml b/dev/tasks/conda-recipes/azure.linux.yml index ce58ba0f7b4..4c3c907b12a 100755 --- a/dev/tasks/conda-recipes/azure.linux.yml +++ b/dev/tasks/conda-recipes/azure.linux.yml @@ -26,9 +26,10 @@ jobs: git -C arrow submodule update --init --recursive displayName: Clone arrow - - script: CI=azure ./run_docker_build.sh + - script: | + mkdir build_artifacts + CI=azure arrow/dev/tasks/conda-recipes/run_docker_build.sh $(pwd)/build_artifacts displayName: Run docker build - workingDirectory: arrow/dev/tasks/conda-recipes # Using github release tries to find a common ancestor between the # currently pushed tag and the latest tag of the github repository @@ -47,7 +48,7 @@ jobs: upload-artifacts \ --sha {{ task.branch }} \ --tag {{ task.tag }} \ - --pattern "arrow/dev/tasks/conda-recipes/build_artifacts/linux-64/*.tar.bz2" + --pattern "build_artifacts/linux-64/*.tar.bz2" env: CROSSBOW_GITHUB_TOKEN: $(CROSSBOW_GITHUB_TOKEN) displayName: Upload packages as a GitHub release diff --git a/dev/tasks/conda-recipes/build_steps.sh b/dev/tasks/conda-recipes/build_steps.sh index 9f243f3a763..5a76b0263a2 100755 --- a/dev/tasks/conda-recipes/build_steps.sh +++ b/dev/tasks/conda-recipes/build_steps.sh @@ -6,6 +6,9 @@ # benefit from the improvement. set -xeuo pipefail + +output_dir=${1} + export PYTHONUNBUFFERED=1 export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" @@ -14,7 +17,7 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc </dev/null && pwd )" ARROW_ROOT=$(cd "$THISDIR/../../.."; pwd;) FEEDSTOCK_ROOT=$THISDIR @@ -23,8 +25,6 @@ if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) fi -ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" - if [ -z "$CONFIG" ]; then set +x FILES=`ls .ci_support/linux_*` @@ -46,8 +46,8 @@ if [ -z "${DOCKER_IMAGE}" ]; then fi fi -mkdir -p "$ARTIFACTS" -DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +mkdir -p "${build_dir}" +DONE_CANARY="${build_dir}/conda-forge-build-done-${CONFIG}" rm -f "$DONE_CANARY" if [ -z "${CI}" ]; then @@ -58,6 +58,7 @@ export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ --shm-size=2G \ -v "${ARROW_ROOT}":/arrow:rw,z \ + -v "${build_dir}":/build:rw \ -e FEEDSTOCK_ROOT="/arrow/dev/tasks/conda-recipes" \ -e CONFIG \ -e HOST_USER_ID \ @@ -65,7 +66,7 @@ docker run ${DOCKER_RUN_ARGS} \ -e ARROW_VERSION \ -e CI \ $DOCKER_IMAGE \ - bash /arrow/dev/tasks/conda-recipes/build_steps.sh + bash /arrow/dev/tasks/conda-recipes/build_steps.sh /build # verify that the end of the script was reached test -f "$DONE_CANARY" diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index ec3e97d2fe9..7d4177fd418 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -15,7 +15,7 @@ # limitations under the License. os: osx -osx_image: xcode8.3 +osx_image: xcode9.3 language: generic # don't build twice @@ -47,7 +47,7 @@ before_install: - brew uninstall boost cgal postgis sfcgal - brew update - brew upgrade cmake - - brew install bison flex grpc openssl@1.1 llvm@7 zlib gperftools + - travis_wait 30 brew install bison flex grpc openssl@1.1 llvm@7 zlib gperftools # Remove shared grpc libraries installed by brew to make sure # we are linked against the static ones. - rm -f /usr/local/opt/grpc/lib/*.dylib @@ -81,7 +81,7 @@ install: # move built wheels to a top level directory - mv -v arrow/python/dist/* dist/ # reinstall openssl because travis' deployment script depends on it - - brew install openssl + - brew install openssl@1.1 deploy: provider: releases