diff --git a/.travis.yml b/.travis.yml index 1334d72e..5add9780 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,13 @@ env: - CONDA_NPY=111 CONDA_PY=27 - CONDA_NPY=112 CONDA_PY=27 + - CONDA_NPY=113 CONDA_PY=27 - CONDA_NPY=111 CONDA_PY=35 - CONDA_NPY=112 CONDA_PY=35 + - CONDA_NPY=113 CONDA_PY=35 - CONDA_NPY=111 CONDA_PY=36 - CONDA_NPY=112 CONDA_PY=36 + - CONDA_NPY=113 CONDA_PY=36 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: "cCqLoE0MXFjPh08A3yFKEWeA7/aRpHUeTxgfJPv9/5MqIzXHjChT7/FZ9kBvxoB2alWQ3DefqLaBX5YoAoDIWUZ2xCxLyJ1vqVicoqh+TmievNkzpu65EMtBBWoFZhSyJXqZ4NhHm4W+WxwrlBEboYTxLsEh41AVoEJg/XIC5ON53NHGxFHuMxtnNyWFIMXj/cJAC+KVhCVysGJ8mLJJdmBvIjOXtfz2Y7k9lXPdMV7taqoxdC02ZDaoAt7sfvARAjsQQZh852RBMB4/qkRMGoywOJUXj+BQx2TCYgAKrYz9WzaST0NzYXQIkrtlbFD045vBvOWUZ+F1L91V1SuCQ5iWjkpdMyEH1gh+E4pSPM9hjP/L5KWrs1AX9vybt7OTBMKo/VI+er1kb0vOZMHyXY6FYG4QDJlfDrcY12vJzEM7WpFldbL3Jq2WRWJzl8ToYBwXmFNl9x+466bxKMhnYUAkx5uhEcZQRhLG2V6LWQr6rgdkAOM7kzDO8NjewX00W1K3HukmjFvCAFuZOAdpLb2lgerb0e69GzBiSqEdhByyerXht4q19xtCmJZBjy54SdyktiyGm+mvnGDo/6/ThRjCOzwIuLqxlK8WpWNXBAmgfY5dqwEMhACs1AP4uxVk4X4sVsHk86qMVEY9S3ZB/E2LMeMZBn0E9B1tu5q/Au0=" diff --git a/appveyor.yml b/appveyor.yml index bcb9dda6..dfc4d61c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,11 +4,6 @@ environment: - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd" - BINSTAR_TOKEN: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. secure: /XxwAsgp0EItmAhoPSov/h0BtAFNj2BuuEqnhgaP9l7Rw2yLBM1lD+3q4LvpVm3B @@ -34,6 +29,16 @@ environment: CONDA_PY: 27 CONDA_INSTALL_LOCN: C:\\Miniconda-x64 + - TARGET_ARCH: x86 + CONDA_NPY: 113 + CONDA_PY: 27 + CONDA_INSTALL_LOCN: C:\\Miniconda + + - TARGET_ARCH: x64 + CONDA_NPY: 113 + CONDA_PY: 27 + CONDA_INSTALL_LOCN: C:\\Miniconda-x64 + - TARGET_ARCH: x86 CONDA_NPY: 111 CONDA_PY: 35 @@ -54,6 +59,16 @@ environment: CONDA_PY: 35 CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 + - TARGET_ARCH: x86 + CONDA_NPY: 113 + CONDA_PY: 35 + CONDA_INSTALL_LOCN: C:\\Miniconda35 + + - TARGET_ARCH: x64 + CONDA_NPY: 113 + CONDA_PY: 35 + CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 + - TARGET_ARCH: x86 CONDA_NPY: 111 CONDA_PY: 36 @@ -74,6 +89,16 @@ environment: CONDA_PY: 36 CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 + - TARGET_ARCH: x86 + CONDA_NPY: 113 + CONDA_PY: 36 + CONDA_INSTALL_LOCN: C:\\Miniconda36 + + - TARGET_ARCH: x64 + CONDA_NPY: 113 + CONDA_PY: 36 + CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 + # We always use a 64-bit machine, but can build x86 distributions # with the TARGET_ARCH variable. @@ -103,7 +128,6 @@ install: - cmd: conda config --add channels conda-forge # Configure the VM. - - cmd: conda install -n root --quiet --yes obvious-ci - cmd: conda install -n root --quiet --yes conda-forge-build-setup - cmd: run_conda_forge_build_setup @@ -111,6 +135,6 @@ install: build: off test_script: - - "%CMD_IN_ENV% conda build recipe --quiet" + - conda build recipe --quiet deploy_script: - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index d8bc5c1d..55dd251e 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -24,16 +24,30 @@ show_channel_urls: true CONDARC ) +# In order for the conda-build process in the container to write to the mounted +# volumes, we need to run with the same id as the host machine, which is +# normally the owner of the mounted volumes, or at least has write permission +HOST_USER_ID=$(id -u) +# Check if docker-machine is being used (normally on OSX) and get the uid from +# the VM +if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then + HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" cat << EOF | docker run -i \ -v "${RECIPE_ROOT}":/recipe_root \ -v "${FEEDSTOCK_ROOT}":/feedstock_root \ + -e HOST_USER_ID="${HOST_USER_ID}" \ -a stdin -a stdout -a stderr \ condaforge/linux-anvil \ bash || exit 1 +set -e +set +x export BINSTAR_TOKEN=${BINSTAR_TOKEN} +set -x export PYTHONUNBUFFERED=1 echo "$config" > ~/.condarc @@ -45,42 +59,42 @@ source run_conda_forge_build_setup # Embarking on 6 case(s). set -x - export CONDA_NPY=111 + export CONDA_NPY=112 export CONDA_PY=27 set +x conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 set -x - export CONDA_NPY=112 + export CONDA_NPY=113 export CONDA_PY=27 set +x conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 set -x - export CONDA_NPY=111 + export CONDA_NPY=112 export CONDA_PY=35 set +x conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 set -x - export CONDA_NPY=112 + export CONDA_NPY=113 export CONDA_PY=35 set +x conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 set -x - export CONDA_NPY=111 + export CONDA_NPY=112 export CONDA_PY=36 set +x conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 set -x - export CONDA_NPY=112 + export CONDA_NPY=113 export CONDA_PY=36 set +x conda build /recipe_root --quiet || exit 1