Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,20 +153,20 @@ variable. The default version is dependent on ``MB_ML_LIBC`` and ``PLAT``.

When ``MB_ML_LIBC`` is ``musllinux``:

* ``multibuild/alpine3.20_x86_64``, when ``PLAT`` is ``x86_64``
* ``multibuild/alpine3.20_arm64v8``, when ``PLAT`` is ``aarch64``
* ``multibuild/alpine3.22_x86_64``, when ``PLAT`` is ``x86_64``
* ``multibuild/alpine3.22_arm64v8``, when ``PLAT`` is ``aarch64``

Otherwise:

* ``multibuild/focal_x86_64``, when ``PLAT`` is ``x86_64``
* ``multibuild/noble_x86_64``, when ``PLAT`` is ``x86_64``
* ``matthewbrett/trusty:32`` when ``PLAT`` is ``i686`` (Yes, an older image for 32-bit)
* ``multibuild/focal_arm64v8`` when ``PLAT`` is ``aarch64``
* ``multibuild/focal_ppc64le`` when ``PLAT`` is ``ppc64le``
* ``multibuild/focal_s390x`` when ``PLAT`` is ``s390x``
* ``multibuild/noble_arm64v8`` when ``PLAT`` is ``aarch64``
* ``multibuild/noble_ppc64le`` when ``PLAT`` is ``ppc64le``
* ``multibuild/noble_s390x`` when ``PLAT`` is ``s390x``

Other valid values are any in https://quay.io/organization/pypa,
using the correct platform code. Alternatively, you can use the substitution
pattern ``multibuild/focal_{PLAT}`` in the ``.travis.yml`` file.
pattern ``multibuild/noble_{PLAT}`` in the ``.travis.yml`` file.

See ``multibuild/docker_test_wrap.sh``.

Expand Down
4 changes: 2 additions & 2 deletions travis_linux_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ function install_run {
if [ "$MB_ML_LIBC" == "musllinux" ]; then
# PLAT is the same as $plat,
# unless $plat is "aarch64", in which case it becomes "arm64v8"
local docker_image="multibuild/alpine3.20_{PLAT}"
local docker_image="multibuild/alpine3.22_{PLAT}"
elif [ "$plat" == i686 ]; then
local docker_image="matthewbrett/trusty:32"
else
# PLAT is the same as $plat,
# unless $plat is "aarch64", in which case it becomes "arm64v8"
local docker_image="multibuild/focal_{PLAT}"
local docker_image="multibuild/noble_{PLAT}"
fi
else
local docker_image="$DOCKER_TEST_IMAGE"
Expand Down