diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 9ffb709..7d71007 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -6,14 +6,15 @@ jobs: - job: linux pool: vmImage: ubuntu-16.04 - timeoutInMinutes: 360 strategy: - maxParallel: 8 matrix: linux_: CONFIG: linux_ - UPLOAD_PACKAGES: True + UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 + maxParallel: 8 + timeoutInMinutes: 360 + steps: # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml index 09ccc16..6fb9802 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_.yaml @@ -7,9 +7,9 @@ ctng_binutils: ctng_cpu_arch: - x86_64 ctng_gcc: -- 7.3.0 +- 7.5.0 ctng_gcc_activation_build_num: -- '18' +- '19' ctng_target_platform: - linux-64 ctng_vendor: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 93b6562..3248b1c 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -13,9 +13,9 @@ ctng_binutils: ctng_cpu_arch: - aarch64 ctng_gcc: -- 7.3.0 +- 7.5.0 ctng_gcc_activation_build_num: -- '18' +- '19' ctng_target_platform: - linux-aarch64 ctng_vendor: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6484cb8..9a2a371 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -9,7 +9,7 @@ ctng_cpu_arch: ctng_gcc: - 8.2.0 ctng_gcc_activation_build_num: -- '18' +- '19' ctng_target_platform: - linux-ppc64le ctng_vendor: diff --git a/.drone.yml b/.drone.yml index 8dd281e..5d50cfb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: CONFIG: linux_aarch64_ UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 - BINSTAR_TOKEN: + BINSTAR_TOKEN: from_secret: BINSTAR_TOKEN commands: - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" diff --git a/.gitattributes b/.gitattributes index ac943c1..9060b27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,7 +17,7 @@ bld.bat text eol=crlf .gitattributes linguist-generated=true .gitignore linguist-generated=true .travis.yml linguist-generated=true -.scripts linguist-generated=true +.scripts/* linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8a4af44..bef68a0 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -19,7 +19,7 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge +conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 066a857..2e4fccc 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -52,13 +52,15 @@ mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" rm -f "$DONE_CANARY" +# Allow people to specify extra default arguments to `docker run` (e.g. `--rm`) +DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}" if [ -z "${CI}" ]; then - DOCKER_RUN_ARGS="-it " + DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ -e CONFIG \ -e BINSTAR_TOKEN \ diff --git a/README.md b/README.md index 15dd18e..10df03a 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Current build status Drone - linux + linux