Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
conda
fsl-ci-rules
Commits
cee8448c
Commit
cee8448c
authored
Nov 13, 2020
by
Paul McCarthy
🚵
Browse files
BF: Not passing channel in pre-build
parent
b9154bff
Changes
2
Hide whitespace changes
Inline
Side-by-side
scripts/build_conda_package.py
View file @
cee8448c
...
@@ -18,6 +18,7 @@ def pre_build_recipe(url, ref, output_dir, *channels):
...
@@ -18,6 +18,7 @@ def pre_build_recipe(url, ref, output_dir, *channels):
"""
"""
with
tempdir
():
with
tempdir
():
fprint
(
f
'Pre-building recipe from
{
url
}
(ref:
{
ref
}
)'
)
sprun
(
f
'git clone
{
url
}
recipe'
)
sprun
(
f
'git clone
{
url
}
recipe'
)
build_recipe
(
'recipe'
,
ref
,
output_dir
,
*
channels
)
build_recipe
(
'recipe'
,
ref
,
output_dir
,
*
channels
)
...
@@ -81,7 +82,7 @@ def main():
...
@@ -81,7 +82,7 @@ def main():
os
.
mkdir
(
local_channel
)
os
.
mkdir
(
local_channel
)
for
ref
,
url
in
prebuild
:
for
ref
,
url
in
prebuild
:
pre_build_recipe
(
url
,
ref
,
local_channel
)
pre_build_recipe
(
url
,
ref
,
local_channel
,
channel_url
)
sprun
(
f
'conda index
{
local_channel
}
'
)
sprun
(
f
'conda index
{
local_channel
}
'
)
sprun
(
'conda install -y -c conda-forge conda-build'
)
sprun
(
'conda install -y -c conda-forge conda-build'
)
...
...
utils/fsl_ci_utils/__init__.py
View file @
cee8448c
...
@@ -49,7 +49,7 @@ def indir(dirname):
...
@@ -49,7 +49,7 @@ def indir(dirname):
def
sprun
(
cmd
,
**
kwargs
):
def
sprun
(
cmd
,
**
kwargs
):
"""Runs the given command with subprocess.run. """
"""Runs the given command with subprocess.run. """
print
(
f
'Running
{
cmd
}
'
)
f
print
(
f
'Running
{
cmd
}
'
)
cmd
=
shlex
.
split
(
cmd
)
cmd
=
shlex
.
split
(
cmd
)
return
sp
.
run
(
cmd
,
check
=
True
,
**
kwargs
)
return
sp
.
run
(
cmd
,
check
=
True
,
**
kwargs
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment