diff --git a/.appveyor.yml b/.appveyor.yml index 43550c0b..54f3d9f5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,7 +21,7 @@ platform: install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py @@ -41,7 +41,7 @@ install: - cmd: conda.exe config --add channels conda-forge # Configure the VM. - - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1 + - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=2 - cmd: run_conda_forge_build_setup # Skip .NET project specific build phase. @@ -50,4 +50,4 @@ build: off test_script: - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml + - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml index a52ae300..aa423afb 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_.yaml @@ -1,5 +1,13 @@ +build_number_decrement: +- '0' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main curl: - '7.59' +docker_image: +- condaforge/linux-anvil pin_run_as_build: curl: max_pin: x diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml index 9264ac0b..db58ddaa 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_.yaml @@ -1,7 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +build_number_decrement: +- '0' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main curl: - '7.59' +docker_image: +- condaforge/linux-anvil macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: diff --git a/.ci_support/win_.yaml b/.ci_support/win_.yaml index a52ae300..1b8e6096 100644 --- a/.ci_support/win_.yaml +++ b/.ci_support/win_.yaml @@ -1,3 +1,7 @@ +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main curl: - '7.59' pin_run_as_build: diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index 1becc901..258a085a 100755 --- a/.circleci/build_steps.sh +++ b/.circleci/build_steps.sh @@ -7,27 +7,34 @@ set -xeuo pipefail export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT=/home/conda/feedstock_root +export RECIPE_ROOT=/home/conda/recipe_root +export CI_SUPPORT=/home/conda/feedstock_root/.ci_support +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc <@conda-forge-admin, please rerender in a comment in this PR for automated rerendering) * [ ] Ensured the license file is being packaged.