Skip to content

Commit

Permalink
Run setup_conda_rc as part of all builds
Browse files Browse the repository at this point in the history
[skip lint]
  • Loading branch information
jakirkham committed Oct 15, 2019
1 parent b2b76b2 commit e219e6f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ skip_commits:
environment:

CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
CONFIG: azure-win-64

matrix:
- PLATFORM: "64"
Expand Down Expand Up @@ -40,7 +41,7 @@ install:


- cmd: appveyor-retry conda.exe install --yes --quiet "conda!=4.6.1,<4.7.11a0" conda-forge-pinning conda-forge-ci-setup=2.* networkx "conda-build>=3.16"

- cmd: setup_conda_rc .\ .\recipes .\.ci_support\%CONFIG%.yaml
- cmd: appveyor-retry run_conda_forge_build_setup

# Skip .NET project specific build phase.
Expand Down
2 changes: 2 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ jobs:
- script: conda.exe config --add channels conda-forge
displayName: configure conda channels

# Configure the VM
- script: setup_conda_rc .\ .\recipes .\.ci_support\%CONFIG%.yaml

# Configure the VM.
- script: call run_conda_forge_build_setup
Expand Down
2 changes: 2 additions & 0 deletions .circleci/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ conda index /home/conda/staged-recipes/build_artifacts

conda install --yes --quiet "conda!=4.6.1,<4.7.11a0" conda-forge-ci-setup=2.* conda-forge-pinning networkx "conda-build>=3.16"
export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/staged-recipes}"
export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support"
setup_conda_rc "${FEEDSTOCK_ROOT}" "${FEEDSTOCK_ROOT}/recipes" "${CI_SUPPORT}/${CONFIG}.yaml"
source run_conda_forge_build_setup

# yum installs anything from a "yum_requirements.txt" file that isn't a blank line or comment.
Expand Down
1 change: 1 addition & 0 deletions .circleci/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ docker run ${DOCKER_RUN_ARGS} \
-v ${REPO_ROOT}:/home/conda/staged-recipes \
-e HOST_USER_ID=${HOST_USER_ID} \
-e AZURE=${AZURE} \
-e CONFIG \
-e CI \
$IMAGE_NAME \
bash \
Expand Down

0 comments on commit e219e6f

Please sign in to comment.