diff --git a/.appveyor.yml b/.appveyor.yml index 409d82c3..2c28744d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -51,5 +51,4 @@ build: off test_script: - conda.exe build recipe -m .ci_support\%CONFIG%.yaml deploy_script: - - conda.exe install conda-forge-ci-setup --use-local -n root --yes --quiet - - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d60ff263..f44e6dd9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -47,7 +47,7 @@ jobs: setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - ./recipe/run_conda_forge_build_setup_osx + source run_conda_forge_build_setup conda update --yes --quiet --override-channels -c conda-forge -c defaults --all env: { OSX_FORCE_SDK_DOWNLOAD: "1" @@ -75,4 +75,4 @@ jobs: displayName: Upload recipe env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) - condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) + condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 372470d1..d78576cd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -72,7 +72,7 @@ jobs: # Configure the VM. - script: | - recipe\run_conda_forge_build_setup_win.bat + run_conda_forge_build_setup displayName: conda-forge build setup diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh index 5330b84a..779d52b6 100755 --- a/.azure-pipelines/build_steps.sh +++ b/.azure-pipelines/build_steps.sh @@ -24,7 +24,7 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -${RECIPE_ROOT}/run_conda_forge_build_setup_linux +run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -35,4 +35,4 @@ if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi -touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}" +touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file