Skip to content
Snippets Groups Projects
Commit 3f5b2055 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Merge branch 'fix-build-skip' into 'master'

Fix use of should_skip_build()

Closes #20

See merge request !34
parents ac1e9f27 19c8bf2c
No related branches found
No related tags found
1 merge request!34Fix use of should_skip_build()
Pipeline #28087 passed
...@@ -139,17 +139,15 @@ def build(recipe_dir, python, condarc, config, no_test, append_file, ...@@ -139,17 +139,15 @@ def build(recipe_dir, python, condarc, config, no_test, append_file,
# pre-renders the recipe - figures out the destination # pre-renders the recipe - figures out the destination
metadata = get_rendered_metadata(d, conda_config) metadata = get_rendered_metadata(d, conda_config)
rendered_recipe = get_parsed_recipe(metadata)
path = get_output_path(metadata, conda_config)
# checks if we should actually build this recipe # checks if we should actually build this recipe
if should_skip_build(metadata): if should_skip_build(metadata):
logger.info('Skipping UNSUPPORTED build of %s-%s-py%s for %s', logger.info('Skipping UNSUPPORTED build of %s for %s', recipe_dir, arch)
rendered_recipe['package']['name'],
rendered_recipe['package']['version'], python.replace('.',''),
arch)
continue continue
rendered_recipe = get_parsed_recipe(metadata)
path = get_output_path(metadata, conda_config)
# gets the next build number # gets the next build number
build_number, _ = next_build_number(channels[0], os.path.basename(path)) build_number, _ = next_build_number(channels[0], os.path.basename(path))
......
...@@ -135,18 +135,14 @@ def rebuild(recipe_dir, python, condarc, config, append_file, ...@@ -135,18 +135,14 @@ def rebuild(recipe_dir, python, condarc, config, append_file,
# pre-renders the recipe - figures out the destination # pre-renders the recipe - figures out the destination
metadata = get_rendered_metadata(d, conda_config) metadata = get_rendered_metadata(d, conda_config)
rendered_recipe = get_parsed_recipe(metadata)
path = get_output_path(metadata, conda_config)
# checks if we should actually build this recipe # checks if we should actually build this recipe
if should_skip_build(metadata): if should_skip_build(metadata):
logger.info('Skipping UNSUPPORTED build of %s-%s-py%s for %s', logger.info('Skipping UNSUPPORTED build of %s for %s', recipe_dir, arch)
rendered_recipe['package']['name'],
rendered_recipe['package']['version'], python.replace('.',''),
arch)
continue continue
rendered_recipe = get_parsed_recipe(metadata)
path = get_output_path(metadata, conda_config)
# Get the latest build number # Get the latest build number
build_number, existing = next_build_number(channels[0], build_number, existing = next_build_number(channels[0],
os.path.basename(path)) os.path.basename(path))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment