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
7a764fff
Commit
7a764fff
authored
5 years ago
by
André Anjos
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue-34' into 'master'
Fix use_local flag after
a0aebba4
(closes
#34
) Closes
#34
See merge request
!72
parents
dd9637be
86e37bec
No related branches found
No related tags found
1 merge request
!72
Fix use_local flag after a0aebba48 (closes #34)
Pipeline
#32114
passed
5 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bob/devtools/build.py
+4
-8
4 additions, 8 deletions
bob/devtools/build.py
bob/devtools/scripts/ci.py
+4
-4
4 additions, 4 deletions
bob/devtools/scripts/ci.py
with
8 additions
and
12 deletions
bob/devtools/build.py
+
4
−
8
View file @
7a764fff
...
...
@@ -471,7 +471,7 @@ def git_clean_build(runner, verbose):
[
'
--exclude=%s
'
%
k
for
k
in
exclude_from_cleanup
])
def
base_build
(
bootstrap
,
server
,
intranet
,
use_local
,
group
,
recipe_dir
,
def
base_build
(
bootstrap
,
server
,
intranet
,
group
,
recipe_dir
,
conda_build_config
,
python_version
,
condarc_options
):
'''
Builds a non-beat/non-bob software dependence that doesn
'
t exist on defaults
...
...
@@ -489,8 +489,6 @@ def base_build(bootstrap, server, intranet, use_local, group, recipe_dir,
server: The base address of the server containing our conda channels
intranet: Boolean indicating if we should add
"
private
"
/
"
public
"
prefixes
on the returned paths
use_local: If set to ``True``, search locally built packages when looking
for dependencies
group: The group of packages (gitlab namespace) the package we
'
re compiling
is part of. Values should match URL namespaces currently available on
our internal webserver. Currently, only
"
bob
"
or
"
beat
"
will work.
...
...
@@ -516,8 +514,7 @@ def base_build(bootstrap, server, intranet, use_local, group, recipe_dir,
public_channels
=
bootstrap
.
get_channels
(
public
=
True
,
stable
=
True
,
server
=
server
,
intranet
=
intranet
,
group
=
group
)
all_channels
=
[
'
local
'
]
if
use_local
else
[]
all_channels
+=
public_channels
+
[
'
defaults
'
]
all_channels
=
public_channels
+
[
'
defaults
'
]
logger
.
info
(
'
Using the following channels during (potential) build:
\n
- %s
'
,
'
\n
-
'
.
join
(
all_channels
))
condarc_options
[
'
channels
'
]
=
all_channels
...
...
@@ -645,9 +642,8 @@ if __name__ == '__main__':
if
not
os
.
path
.
exists
(
os
.
path
.
join
(
recipe
,
'
meta.yaml
'
)):
# ignore - not a conda package
continue
base_build
(
bootstrap
,
server
,
not
args
.
internet
,
True
,
args
.
group
,
recipe
,
conda_build_config
,
args
.
python_version
,
condarc_options
)
base_build
(
bootstrap
,
server
,
not
args
.
internet
,
args
.
group
,
recipe
,
conda_build_config
,
args
.
python_version
,
condarc_options
)
# notice this condarc typically will only contain the defaults channel - we
# need to boost this up with more channels to get it right for this package's
...
...
This diff is collapsed.
Click to expand it.
bob/devtools/scripts/ci.py
+
4
−
4
View file @
7a764fff
...
...
@@ -648,13 +648,13 @@ def docs(ctx, requirement, dry_run):
This command:
\b
1. Clones all the necessary packages necessary to build the bob/beat
documentation
\b
\b
2. Generates the `extra-intersphinx.txt` and `nitpick-exceptions.txt` file
\b
\b
This command is supposed to be run **instead** of `bdt ci build...`
...
...
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