Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
77d16ccf
Commit
77d16ccf
authored
Jul 23, 2019
by
Matthew Brett
Browse files
Allow PLAT to be unset
Set defaults for PLAT where needed
parent
7287f694
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
tests/test_multibuild.sh
tests/test_multibuild.sh
+2
-1
travis_linux_steps.sh
travis_linux_steps.sh
+3
-3
No files found.
tests/test_multibuild.sh
View file @
77d16ccf
...
...
@@ -26,7 +26,8 @@ if [ -n "$TEST_BUILDS" ]; then
else
touch
config.sh
source
travis_linux_steps.sh
build_multilinux
$PLAT
"source tests/test_library_builders.sh"
my_plat
=
${
PLAT
:-
x86_64
}
build_multilinux
$my_plat
"source tests/test_library_builders.sh"
fi
fi
...
...
travis_linux_steps.sh
View file @
77d16ccf
...
...
@@ -43,7 +43,7 @@ function build_wheel {
# WHEEL_SDIR (optional)
local
repo_dir
=
${
1
:-
$REPO_DIR
}
[
-z
"
$repo_dir
"
]
&&
echo
"repo_dir not defined"
&&
exit
1
local
plat
=
${
2
:-
$PLAT
}
local
plat
=
${
2
:-$
{
PLAT
:-
x86_64
}
}
build_multilinux
$plat
"build_wheel
$repo_dir
"
}
...
...
@@ -61,7 +61,7 @@ function build_index_wheel {
# WHEEL_SDIR (optional)
local
project_spec
=
$1
[
-z
"
$project_spec
"
]
&&
echo
"project_spec not defined"
&&
exit
1
local
plat
=
${
2
:-
$PLAT
}
local
plat
=
${
2
:-$
{
PLAT
:-
x86_64
}
}
build_multilinux
$plat
"build_index_wheel
$project_spec
"
}
...
...
@@ -112,7 +112,7 @@ function install_run {
# WHEEL_SDIR (optional)
# MANYLINUX_URL (optional)
# TEST_DEPENDS (optional)
local
plat
=
${
1
:-
$PLAT
}
local
plat
=
${
1
:-$
{
PLAT
:-
x86_64
}
}
bitness
=
$(
[
"
$plat
"
==
i686
]
&&
echo
32
||
echo
64
)
local
docker_image
=
"matthewbrett/trusty:
$bitness
"
docker pull
$docker_image
...
...
Write
Preview
Markdown
is supported
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