Merge pull request #83 from CDAT/for_release

For release
CDAT · Jul 21, 2020 · 5641a63 · 5641a63
2 parents a0d0b79 + 41a988d
commit 5641a63
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py
@@ -311,15 +311,15 @@ def rerender(conda_activate, conda_env, conda_rc, dir, **kwargs):
     run_cmd(cmd, join_stderr, shell_cmd, verbose, dir)
     return ret
 
-def do_build(conda_activate, conda_env, conda_rc, dir, py_version, copy_conda_package, **kwargs):
+def do_build(conda_activate, conda_env, conda_rc, dir, py_version, copy_conda_package, extra_channels, **kwargs):
     print("...do_build..., py_version: {v}, dir: {d}".format(v=py_version,
                                                              d=dir))
     ret = SUCCESS
     env = {"CONDARC": conda_rc}
     variant_files_dir = os.path.join(dir, ".ci_support")
     if py_version == "noarch":
         variant_file = os.path.join(variant_files_dir, "linux_.yaml")
-        cmd = "source {} {}; conda build -m {} recipe/".format(conda_activate, conda_env, variant_file)
+        cmd = "source {} {}; conda build {} -m {} recipe/".format(conda_activate, conda_env, extra_channels, variant_file)
         ret = run_cmd(["/bin/bash", "-c", cmd], join_stderr, shell_cmd, verbose, dir, env=env)
 
         if copy_conda_package is not None:
@@ -333,7 +333,7 @@ def do_build(conda_activate, conda_env, conda_rc, dir, py_version, copy_conda_pa
             variant_files = glob.glob("{d}/.ci_support/linux*{v}*.yaml".format(d=dir, v=py_version))
 
         for variant_file in variant_files:
-            cmd = "source {} {}; conda build -m {} recipe/".format(conda_activate, conda_env, variant_file)
+            cmd = "source {} {}; conda build {} -m {} recipe/".format(conda_activate, conda_env, extra_channels, variant_file)
             ret = run_cmd(["/bin/bash", "-c", cmd], join_stderr, shell_cmd, verbose, dir, env=env)
             if ret != SUCCESS:
                 print("FAIL: {c}".format(c=cmd))