diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index 5cd842df8..d53d27815 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -8,7 +8,6 @@ fi if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then - MB_ML_VER="2010" DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" else MB_PYTHON_OSX_VER="10.9" diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a7d130409..943a6a03e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -23,8 +23,6 @@ jobs: exclude: - os: "macos-latest" platform: "i686" - - os: "ubuntu-20.04" - python: "3.10" include: - os: "macos-latest" os-name: "osx" @@ -83,8 +81,6 @@ jobs: exclude: - os: "macos-latest" platform: "i686" - - os: "ubuntu-20.04" - python: "3.10" include: - os: "macos-latest" os-name: "osx" diff --git a/.travis.yml b/.travis.yml index 775783dae..c7c3b4c19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,14 +19,12 @@ jobs: arch: arm64 env: - PLAT=aarch64 - - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.6 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.7 Focal aarch64" arch: arm64 env: - PLAT=aarch64 - - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.7 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.8 Focal aarch64" @@ -34,7 +32,6 @@ jobs: arch: arm64 env: - PLAT=aarch64 - - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.8 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.9 Focal aarch64" @@ -42,7 +39,6 @@ jobs: arch: arm64 env: - PLAT=aarch64 - - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.9 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.10 Focal aarch64" @@ -50,7 +46,6 @@ jobs: arch: arm64 env: - PLAT=aarch64 - - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.10 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} diff --git a/multibuild b/multibuild index 13a01725b..cdffc5284 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 13a01725b0f0aa551ab34aa2311cdc1c77be4337 +Subproject commit cdffc52846355707f389808414cf8dfe31289328