Skip to content

Commit 6e5f054

Browse files
authored
pass in conda_build_env=base when doing 'make conda-rerender' and 'make conda-build' in .circleci/config.yml (#448)
1 parent 431b234 commit 6e5f054

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ aliases:
2626
source $BASH_ENV
2727
source $WORKDIR/miniconda/etc/profile.d/conda.sh
2828
conda activate base
29-
make conda-rerender workdir=$WORKDIR branch=$CIRCLE_BRANCH
29+
make conda-rerender workdir=$WORKDIR conda_build_env=base branch=$CIRCLE_BRANCH
3030
3131
- &conda_build
3232
name: conda_build
@@ -36,7 +36,7 @@ aliases:
3636
conda activate base
3737
os=`uname`
3838
artifacts_dir="artifacts/artifacts.${os}.noarch"
39-
make conda-build workdir=$WORKDIR artifact_dir=$PWD/$artifacts_dir
39+
make conda-build workdir=$WORKDIR conda_build_env=base artifact_dir=$PWD/$artifacts_dir
4040
4141
- &setup_run_tests
4242
name: setup_run_tests

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ endif
2626

2727
last_stable ?= 8.2
2828

29-
conda_test_env = test-$(pkg_name)
30-
conda_build_env = build-$(pkg_name)
29+
conda_test_env ?= test-$(pkg_name)
30+
conda_build_env ?= build-$(pkg_name)
3131

3232
branch ?= $(shell git rev-parse --abbrev-ref HEAD)
3333
extra_channels ?= cdat/label/nightly conda-forge

0 commit comments

Comments
 (0)