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
72868479
Unverified
Commit
72868479
authored
Oct 22, 2021
by
John Jones
Browse files
switch to multibuild provided alpine test images because... reasons?
parent
980d9b0e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
15 deletions
+3
-15
docker_test_wrap.sh
docker_test_wrap.sh
+0
-11
library_builders.sh
library_builders.sh
+1
-1
manylinux_utils.sh
manylinux_utils.sh
+1
-1
travis_linux_steps.sh
travis_linux_steps.sh
+1
-2
No files found.
docker_test_wrap.sh
View file @
72868479
...
@@ -2,17 +2,6 @@
...
@@ -2,17 +2,6 @@
# Install and test steps on Linux
# Install and test steps on Linux
set
-e
set
-e
# shim for python:alpine not having bash
if
[
-f
"/etc/alpine-release"
]
;
then
apk update
apk add bash
fi
if
[
-z
"
$BASH
"
]
;
then
bash
$0
$@
exit
$?
fi
# "python" and "pip" are already on the path as part of the docker
# "python" and "pip" are already on the path as part of the docker
# startup code in choose_python.sh, but the following are required and not
# startup code in choose_python.sh, but the following are required and not
# necessarily already set
# necessarily already set
...
...
library_builders.sh
View file @
72868479
...
@@ -416,7 +416,7 @@ function build_suitesparse {
...
@@ -416,7 +416,7 @@ function build_suitesparse {
if
[
-n
"
$IS_MACOS
"
]
;
then
if
[
-n
"
$IS_MACOS
"
]
;
then
brew
install
suite-sparse
>
/dev/null
brew
install
suite-sparse
>
/dev/null
elif
[
-n
"
$IS_ALPINE
"
]
;
then
elif
[
-n
"
$IS_ALPINE
"
]
;
then
apk add suitesparse-dev
apk add suitesparse-dev
elif
[[
$MB_ML_VER
==
"_2_24"
]]
;
then
elif
[[
$MB_ML_VER
==
"_2_24"
]]
;
then
# debian:9 based distro
# debian:9 based distro
apt-get
install
-y
libsuitesparse-dev
>
/dev/null
apt-get
install
-y
libsuitesparse-dev
>
/dev/null
...
...
manylinux_utils.sh
View file @
72868479
...
@@ -45,7 +45,7 @@ function activate_ccache {
...
@@ -45,7 +45,7 @@ function activate_ccache {
# Now install ccache
# Now install ccache
local
ccache_dir
local
ccache_dir
if
[
-n
"
$IS_ALPINE
"
]
;
then
if
[
-n
"
$IS_ALPINE
"
]
;
then
supress apk add ccache
supress apk add ccache
ccache_dir
=
'/usr/lib/ccache/bin'
ccache_dir
=
'/usr/lib/ccache/bin'
else
else
...
...
travis_linux_steps.sh
View file @
72868479
...
@@ -120,7 +120,7 @@ function install_run {
...
@@ -120,7 +120,7 @@ function install_run {
local
plat
=
${
1
:-${
PLAT
:-
x86_64
}}
local
plat
=
${
1
:-${
PLAT
:-
x86_64
}}
if
[
-z
"
$DOCKER_TEST_IMAGE
"
]
;
then
if
[
-z
"
$DOCKER_TEST_IMAGE
"
]
;
then
if
[
"
$MB_ML_LIBC
"
==
"musllinux"
]
;
then
if
[
"
$MB_ML_LIBC
"
==
"musllinux"
]
;
then
local
docker_image
=
"
python:
$MB_PYTHON_VERSION
-alpine
"
local
docker_image
=
"
multibuild/alpine3.14_
$plat
"
else
else
local
bitness
=
$(
[
"
$plat
"
==
i686
]
&&
echo
32
||
echo
64
)
local
bitness
=
$(
[
"
$plat
"
==
i686
]
&&
echo
32
||
echo
64
)
local
docker_image
=
"matthewbrett/trusty:
$bitness
"
local
docker_image
=
"matthewbrett/trusty:
$bitness
"
...
@@ -140,6 +140,5 @@ function install_run {
...
@@ -140,6 +140,5 @@ function install_run {
-e
MANYLINUX_URL
=
"
$MANYLINUX_URL
"
\
-e
MANYLINUX_URL
=
"
$MANYLINUX_URL
"
\
-e
TEST_DEPENDS
=
"
$TEST_DEPENDS
"
\
-e
TEST_DEPENDS
=
"
$TEST_DEPENDS
"
\
-v
$PWD
:/io
\
-v
$PWD
:/io
\
--entrypoint
sh
\
$docker_image
/io/
$MULTIBUILD_DIR
/docker_test_wrap.sh
$docker_image
/io/
$MULTIBUILD_DIR
/docker_test_wrap.sh
}
}
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