Skip to content
Snippets Groups Projects
Commit cc2d2841 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Fix NameErrors in ci base-build and ci test commands

parent 63a5ccdb
No related branches found
No related tags found
1 merge request!84Fix NameErrors in ci base-build and ci test commands
Pipeline #32341 passed
...@@ -278,7 +278,7 @@ def base_build(order, group, python, dry_run): ...@@ -278,7 +278,7 @@ def base_build(order, group, python, dry_run):
this context. 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')) branch=os.environ.get('CI_COMMIT_REF_NAME'))
condarc = condarc or os.path.join(os.environ['CONDA_ROOT'], 'condarc') condarc = condarc or os.path.join(os.environ['CONDA_ROOT'], 'condarc')
...@@ -379,7 +379,7 @@ def test(ctx, dry_run): ...@@ -379,7 +379,7 @@ def test(ctx, dry_run):
# Use custom variants and append files if available on recipe-dir # Use custom variants and append files if available on recipe-dir
recipe_dir = os.path.join(os.path.realpath(os.curdir), 'conda') 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')) branch=os.environ.get('CI_COMMIT_REF_NAME'))
if condarc is not None: if condarc is not None:
logger.info('Condarc configuration file: %s', condarc) logger.info('Condarc configuration file: %s', condarc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment