Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.devtools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bob
bob.devtools
Commits
3f5b2055
Commit
3f5b2055
authored
6 years ago
by
André Anjos
Browse files
Options
Downloads
Plain Diff
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
!34
Fix use of should_skip_build()
Pipeline
#28087
passed
6 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bob/devtools/scripts/build.py
+4
-6
4 additions, 6 deletions
bob/devtools/scripts/build.py
bob/devtools/scripts/rebuild.py
+4
-8
4 additions, 8 deletions
bob/devtools/scripts/rebuild.py
with
8 additions
and
14 deletions
bob/devtools/scripts/build.py
+
4
−
6
View file @
3f5b2055
...
@@ -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
))
...
...
This diff is collapsed.
Click to expand it.
bob/devtools/scripts/rebuild.py
+
4
−
8
View file @
3f5b2055
...
@@ -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
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment