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
fa2c0c62
Commit
fa2c0c62
authored
Mar 02, 2020
by
mattip
Browse files
fix image for aarch64, ppc64le, s390x
parent
bb46ec2a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
.travis.yml
.travis.yml
+3
-0
common_utils.sh
common_utils.sh
+6
-1
supported_wheels.py
supported_wheels.py
+0
-1
No files found.
.travis.yml
View file @
fa2c0c62
...
...
@@ -195,6 +195,7 @@ matrix:
-
MB_ML_VER=2014
-
TEST_BUILDS=1
-
PLAT=aarch64
-
DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
# s390x builds
-
os
:
linux
arch
:
s390x
...
...
@@ -203,6 +204,7 @@ matrix:
-
MB_ML_VER=2014
-
TEST_BUILDS=1
-
PLAT=s390x
-
DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
# ppc64le builds
-
os
:
linux
arch
:
ppc64le
...
...
@@ -211,6 +213,7 @@ matrix:
-
MB_ML_VER=2014
-
TEST_BUILDS=1
-
PLAT=ppc64le
-
DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
script
:
-
export ENV_VARS_PATH="tests/env_vars.sh"
...
...
common_utils.sh
View file @
fa2c0c62
...
...
@@ -333,17 +333,22 @@ function install_wheel {
# WHEEL_SDIR (optional, default "
wheelhouse
")
# TEST_DEPENDS (optional, default "")
# MANYLINUX_URL (optional, default "") (via pip_opts function)
set -x
local wheelhouse=
$(
abspath
${
WHEEL_SDIR
:-
wheelhouse
}
)
if [ -n "
$TEST_DEPENDS
" ]; then
while read TEST_DEPENDENCY; do
pip install
$(
pip_opts
)
$@
$TEST_DEPENDENCY
done <<< "
$TEST_DEPENDS
"
fi
ls .
which pip
which python
pip install packaging
get_platform
local supported_wheels=
$(
python
$MULTIBUILD_DIR
/supported_wheels.py
$wheelhouse
/
*
.whl
)
if [ -z "
$supported_wheels
" ]; then
echo "
ERROR: no supported wheels found
"
ls
$wheelhouse
/*.whl
exit 1
fi
# Install compatible wheel
...
...
supported_wheels.py
View file @
fa2c0c62
...
...
@@ -34,6 +34,5 @@ def main():
if
supported
.
intersection
(
tags
):
print
(
fname
)
if
__name__
==
'__main__'
:
main
()
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