diff --git a/bob/devtools/scripts/ci.py b/bob/devtools/scripts/ci.py index 6023c4b6af7fd13c948f50d3b9f063a903caf095..d18d6018624bee21a063726ba124b575b54569aa 100644 --- a/bob/devtools/scripts/ci.py +++ b/bob/devtools/scripts/ci.py @@ -278,7 +278,7 @@ def base_build(order, group, python, dry_run): this context. """ - condarc = select_user_condarc(paths=[recipe, os.curdir], + condarc = select_user_condarc(paths=[os.curdir], branch=os.environ.get('CI_COMMIT_REF_NAME')) condarc = condarc or os.path.join(os.environ['CONDA_ROOT'], 'condarc') @@ -379,7 +379,7 @@ def test(ctx, dry_run): # Use custom variants and append files if available on recipe-dir recipe_dir = os.path.join(os.path.realpath(os.curdir), 'conda') - condarc = select_user_condarc(paths=[recipe, os.curdir], + condarc = select_user_condarc(paths=[recipe_dir, os.curdir], branch=os.environ.get('CI_COMMIT_REF_NAME')) if condarc is not None: logger.info('Condarc configuration file: %s', condarc)