Skip to content

Commit

Permalink
Merge branch 'main' into add-pypy-3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Dec 12, 2022
2 parents a5a9f25 + 8149809 commit b0d3dcf
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
28 changes: 28 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ jobs:
env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.8
- name: "3.8 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.8
- name: "3.9 Focal manylinux2014 aarch64"
os: linux
arch: arm64
Expand All @@ -47,6 +54,13 @@ jobs:
env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.9
- name: "3.9 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.9
- name: "3.10 Focal manylinux2014 aarch64"
os: linux
arch: arm64
Expand All @@ -59,6 +73,13 @@ jobs:
env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.10
- name: "3.10 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.10
- name: "3.11 Focal manylinux_2_28 aarch64"
os: linux
arch: arm64
Expand All @@ -71,6 +92,13 @@ jobs:
env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.11
- name: "3.11 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.11

before_install:
- source multibuild/common_utils.sh
Expand Down
2 changes: 1 addition & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function pre_build {
build_simple xcb-proto 1.15.2 https://xcb.freedesktop.org/dist
if [ -n "$IS_MACOS" ]; then
build_simple xorgproto 2022.2 https://www.x.org/pub/individual/proto
build_simple libXau 1.0.10 https://www.x.org/pub/individual/lib
build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib
build_simple libpthread-stubs 0.4 https://xcb.freedesktop.org/dist
cp venv/share/pkgconfig/xcb-proto.pc venv/lib/pkgconfig/xcb-proto.pc
else
Expand Down
2 changes: 1 addition & 1 deletion multibuild

0 comments on commit b0d3dcf

Please sign in to comment.