Merge pull request #301 from radarhere/manylinux

Added manylinux_2_28
This commit is contained in:
Hugo van Kemenade 2022-05-31 08:38:18 +03:00 committed by GitHub
commit a3062e30d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 6 deletions

View File

@ -16,7 +16,7 @@ env:
jobs: jobs:
build: build:
name: ${{ matrix.python }} ${{ matrix.mb-ml-libc }} ${{ matrix.platform }} name: ${{ matrix.python }} ${{ matrix.mb-ml-libc }}${{ matrix.mb-ml-ver }} ${{ matrix.platform }}
runs-on: "ubuntu-20.04" runs-on: "ubuntu-20.04"
strategy: strategy:
fail-fast: false fail-fast: false
@ -24,21 +24,29 @@ jobs:
python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10" ] python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10" ]
platform: [ "i686", "x86_64" ] platform: [ "i686", "x86_64" ]
mb-ml-libc: [ "manylinux" ] mb-ml-libc: [ "manylinux" ]
mb-ml-ver: [ 2014, "_2_28" ]
exclude:
- platform: "i686"
mb-ml-ver: "_2_28"
include: include:
- python: "3.8" - python: "3.8"
platform: "x86_64" platform: "x86_64"
mb-ml-libc: "musllinux" mb-ml-libc: "musllinux"
mb-ml-ver: "_1_1"
- python: "3.9" - python: "3.9"
platform: "x86_64" platform: "x86_64"
mb-ml-libc: "musllinux" mb-ml-libc: "musllinux"
mb-ml-ver: "_1_1"
- python: "3.10" - python: "3.10"
platform: "x86_64" platform: "x86_64"
mb-ml-libc: "musllinux" mb-ml-libc: "musllinux"
mb-ml-ver: "_1_1"
env: env:
BUILD_COMMIT: ${{ inputs.build-commit }} BUILD_COMMIT: ${{ inputs.build-commit }}
PLAT: ${{ matrix.platform }} PLAT: ${{ matrix.platform }}
MB_PYTHON_VERSION: ${{ matrix.python }} MB_PYTHON_VERSION: ${{ matrix.python }}
MB_ML_LIBC: ${{ matrix.mb-ml-libc }} MB_ML_LIBC: ${{ matrix.mb-ml-libc }}
MB_ML_VER: ${{ matrix.mb-ml-ver }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

View File

@ -13,24 +13,51 @@ services: docker
jobs: jobs:
include: include:
- name: "3.7 Focal aarch64" - name: "3.7 Focal manylinux2014 aarch64"
arch: arm64 arch: arm64
env: env:
- MB_ML_VER=2014
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
- name: "3.8 Focal aarch64" - name: "3.7 Focal manylinux_2_28 aarch64"
arch: arm64
env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.7
- name: "3.8 Focal manylinux2014 aarch64"
os: linux os: linux
arch: arm64 arch: arm64
env: env:
- MB_ML_VER=2014
- MB_PYTHON_VERSION=3.8 - MB_PYTHON_VERSION=3.8
- name: "3.9 Focal aarch64" - name: "3.8 Focal manylinux_2_28 aarch64"
os: linux os: linux
arch: arm64 arch: arm64
env: env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.8
- name: "3.9 Focal manylinux2014 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER=2014
- MB_PYTHON_VERSION=3.9 - MB_PYTHON_VERSION=3.9
- name: "3.10 Focal aarch64" - name: "3.9 Focal manylinux_2_28 aarch64"
os: linux os: linux
arch: arm64 arch: arm64
env: env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.9
- name: "3.10 Focal manylinux2014 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER=2014
- MB_PYTHON_VERSION=3.10
- name: "3.10 Focal manylinux_2_28 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.10 - MB_PYTHON_VERSION=3.10
before_install: before_install:

View File

@ -17,7 +17,7 @@ if [[ -n "$IS_MACOS" ]]; then
else else
GIFLIB_VERSION=5.2.1 GIFLIB_VERSION=5.2.1
fi fi
if [[ -n "$IS_MACOS" ]] || [[ -n "$IS_ALPINE" ]]; then if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
ZLIB_VERSION=1.2.12 ZLIB_VERSION=1.2.12
else else
ZLIB_VERSION=1.2.8 ZLIB_VERSION=1.2.8