diff --git a/LICENSE b/LICENSE index 04ad21b5..7f5c3634 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) conda-forge +Copyright (c) 2015-2017, conda-forge All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/ci_support/fast_finish_ci_pr_build.sh b/ci_support/fast_finish_ci_pr_build.sh new file mode 100755 index 00000000..463c27fb --- /dev/null +++ b/ci_support/fast_finish_ci_pr_build.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ + python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index 3ac58c47..5c1bacb5 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -24,14 +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 $? + bash || exit 1 +set -e +set +x export BINSTAR_TOKEN=${BINSTAR_TOKEN} +set -x export PYTHONUNBUFFERED=1 echo "$config" > ~/.condarc @@ -44,4 +60,11 @@ source run_conda_forge_build_setup # Embarking on 1 case(s). conda build /recipe_root --quiet || exit 1 upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 +touch /feedstock_root/build_artefacts/conda-forge-build-done EOF + +# double-check that the build got to the end +# see https://github.com/conda-forge/conda-smithy/pull/337 +# for a possible fix +set -x +test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1 diff --git a/circle.yml b/circle.yml index 0c5dcdfe..421809c1 100644 --- a/circle.yml +++ b/circle.yml @@ -1,5 +1,6 @@ checkout: post: + - ./ci_support/fast_finish_ci_pr_build.sh - ./ci_support/checkout_merge_commit.sh machine: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cfed335d..edbffaaa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,5 @@ {% set version = "5.3.3" %} +{% set variant = "openblas" %} package: name: gmt @@ -10,8 +11,10 @@ source: sha256: b5e592d7482de5dee06268a0a048949f5cf626ef67b0419515ce3d14f4aa82c6 build: - number: 0 + number: 1 skip: True # [win or osx] + features: + - blas_{{ variant }} requirements: build: @@ -22,6 +25,7 @@ requirements: - libnetcdf 4.4.* - hdf5 1.8.17|1.8.17.* - zlib 1.2.* + - blas 1.1 {{ variant }} run: - fftw - gdal 2.1.* @@ -29,6 +33,7 @@ requirements: - libnetcdf 4.4.* - hdf5 1.8.17|1.8.17.* - zlib 1.2.* + - blas 1.1 {{ variant }} test: commands: