"wrappers/python/src/vscode:/vscode.git/clone" did not exist on "596a4197412f2e59dba2dc4e48c26d53d07c337f"
Commit fa2c0c62 authored by mattip's avatar mattip
Browse files

fix image for aarch64, ppc64le, s390x

parent bb46ec2a
...@@ -195,6 +195,7 @@ matrix: ...@@ -195,6 +195,7 @@ matrix:
- MB_ML_VER=2014 - MB_ML_VER=2014
- TEST_BUILDS=1 - TEST_BUILDS=1
- PLAT=aarch64 - PLAT=aarch64
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
# s390x builds # s390x builds
- os: linux - os: linux
arch: s390x arch: s390x
...@@ -203,6 +204,7 @@ matrix: ...@@ -203,6 +204,7 @@ matrix:
- MB_ML_VER=2014 - MB_ML_VER=2014
- TEST_BUILDS=1 - TEST_BUILDS=1
- PLAT=s390x - PLAT=s390x
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
# ppc64le builds # ppc64le builds
- os: linux - os: linux
arch: ppc64le arch: ppc64le
...@@ -211,6 +213,7 @@ matrix: ...@@ -211,6 +213,7 @@ matrix:
- MB_ML_VER=2014 - MB_ML_VER=2014
- TEST_BUILDS=1 - TEST_BUILDS=1
- PLAT=ppc64le - PLAT=ppc64le
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
script: script:
- export ENV_VARS_PATH="tests/env_vars.sh" - export ENV_VARS_PATH="tests/env_vars.sh"
......
...@@ -333,17 +333,22 @@ function install_wheel { ...@@ -333,17 +333,22 @@ function install_wheel {
# WHEEL_SDIR (optional, default "wheelhouse") # WHEEL_SDIR (optional, default "wheelhouse")
# TEST_DEPENDS (optional, default "") # TEST_DEPENDS (optional, default "")
# MANYLINUX_URL (optional, default "") (via pip_opts function) # MANYLINUX_URL (optional, default "") (via pip_opts function)
set -x
local wheelhouse=$(abspath ${WHEEL_SDIR:-wheelhouse}) local wheelhouse=$(abspath ${WHEEL_SDIR:-wheelhouse})
if [ -n "$TEST_DEPENDS" ]; then if [ -n "$TEST_DEPENDS" ]; then
while read TEST_DEPENDENCY; do while read TEST_DEPENDENCY; do
pip install $(pip_opts) $@ $TEST_DEPENDENCY pip install $(pip_opts) $@ $TEST_DEPENDENCY
done <<< "$TEST_DEPENDS" done <<< "$TEST_DEPENDS"
fi fi
ls .
which pip
which python
pip install packaging pip install packaging
get_platform
local supported_wheels=$(python $MULTIBUILD_DIR/supported_wheels.py $wheelhouse/*.whl) local supported_wheels=$(python $MULTIBUILD_DIR/supported_wheels.py $wheelhouse/*.whl)
if [ -z "$supported_wheels" ]; then if [ -z "$supported_wheels" ]; then
echo "ERROR: no supported wheels found" echo "ERROR: no supported wheels found"
ls $wheelhouse/*.whl
exit 1 exit 1
fi fi
# Install compatible wheel # Install compatible wheel
......
...@@ -34,6 +34,5 @@ def main(): ...@@ -34,6 +34,5 @@ def main():
if supported.intersection(tags): if supported.intersection(tags):
print(fname) print(fname)
if __name__ == '__main__': if __name__ == '__main__':
main() main()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment