Skip to content

Commit

Permalink
Merge pull request #82 from CDAT/for_release
Browse files Browse the repository at this point in the history
update prepare_recipe_in_local_feedstock() to copy over recipe from repo to fake feedstock
  • Loading branch information
muryanto1 authored Jul 16, 2020
2 parents b2f2755 + fbd8a05 commit a0d0b79
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build_tools/conda_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ def construct_pkg_ver(repo_dir, arg_version, arg_last_stable):
print("repo_dir: {d}".format(d=repo_dir))
files = ["recipe/conda_build_config.yaml",
"recipe/build.sh",
".ci_support/migrations/python38.yaml"]
".ci_support/migrations/python38.yaml",
".ci_support/migrations/hdf51106.yaml"]

if is_conda_forge_pkg:
if args.do_rerender:
Expand Down
11 changes: 11 additions & 0 deletions build_tools/release_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,17 @@ def prepare_recipe_in_local_feedstock_repo(package_name, organization, repo_name
# merge this recipe to feedstock and delete the recipe from the repo.
#
repo_recipe = os.path.join(repo_dir, "recipe", "meta.yaml.in")

#
# if branch name starts with 'for_release', we are building a non conda-forge
# package for a release, and the branch should have the recipe ready for
# rerender, so just copy over to the fake feedstock.
#
for_release = branch.startswith("for_release")
if for_release:
shutil.copyfile(repo_recipe, recipe_file)
return SUCCESS

if os.path.isfile(repo_recipe):
print("\nNOTE: {r} exists, we will build using this recipe.\n".format(r=repo_recipe))
recipe_file_source = repo_recipe
Expand Down

0 comments on commit a0d0b79

Please sign in to comment.