Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For release #83

Merged
merged 3 commits into from
Jul 21, 2020
Merged

For release #83

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40c0982
adding channel to conda build -- for non noarch for now
LinaMuryanto Jul 21, 2020
45cfc40
added -c channel for conda build for non noarch for now
LinaMuryanto Jul 21, 2020
41a988d
pass in extra_channels
LinaMuryanto Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build_tools/release_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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))
Expand Down