diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index b31d7cdd2..56397b785 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -18,11 +18,6 @@ fi if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then MB_PYTHON_OSX_VER="10.9" - if [[ "$PLAT" == "i686" ]]; then - DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" - fi -elif [[ "$MB_PYTHON_VERSION" == "3.11" ]] && [[ "$PLAT" == "i686" ]]; then - DOCKER_TEST_IMAGE="radarhere/bionic-$PLAT" fi echo "::group::Install a virtualenv" diff --git a/.github/workflows/wheels-linux.yml b/.github/workflows/wheels-linux.yml index fc65611b1..de8745dd9 100644 --- a/.github/workflows/wheels-linux.yml +++ b/.github/workflows/wheels-linux.yml @@ -16,7 +16,7 @@ env: jobs: build: - name: ${{ matrix.python }} ${{ matrix.mb-ml-libc }}${{ matrix.mb-ml-ver }} ${{ matrix.platform }} + name: ${{ matrix.python }} ${{ matrix.mb-ml-libc }}${{ matrix.mb-ml-ver }} runs-on: "ubuntu-latest" strategy: fail-fast: false @@ -30,38 +30,26 @@ jobs: "3.11", "3.12", ] - platform: [ "i686", "x86_64" ] mb-ml-libc: [ "manylinux" ] mb-ml-ver: [ 2014, "_2_28" ] - exclude: - - platform: "i686" - mb-ml-ver: "_2_28" - - platform: "i686" - python: "3.12" include: - python: "3.8" - platform: "x86_64" mb-ml-libc: "musllinux" mb-ml-ver: "_1_1" - python: "3.9" - platform: "x86_64" mb-ml-libc: "musllinux" mb-ml-ver: "_1_1" - python: "3.10" - platform: "x86_64" mb-ml-libc: "musllinux" mb-ml-ver: "_1_1" - python: "3.11" - platform: "x86_64" mb-ml-libc: "musllinux" mb-ml-ver: "_1_1" - python: "3.12" - platform: "x86_64" mb-ml-libc: "musllinux" mb-ml-ver: "_1_1" env: BUILD_COMMIT: ${{ inputs.build-commit }} - PLAT: ${{ matrix.platform }} MB_PYTHON_VERSION: ${{ matrix.python }} MB_ML_LIBC: ${{ matrix.mb-ml-libc }} MB_ML_VER: ${{ matrix.mb-ml-ver }} diff --git a/config.sh b/config.sh index a68e41e98..a6139ffd2 100644 --- a/config.sh +++ b/config.sh @@ -156,11 +156,7 @@ function run_tests { apt-get update apt-get install -y curl libfribidi0 unzip fi - if [[ $(uname -m) == "i686" ]]; then - if [[ "$MB_PYTHON_VERSION" != 3.11 ]]; then - python3 -m pip install numpy==1.21 - fi - elif [ -z "$IS_ALPINE" ] && [[ "$MB_PYTHON_VERSION" != 3.12 ]]; then + if [ -z "$IS_ALPINE" ] && [[ "$MB_PYTHON_VERSION" != 3.12 ]]; then python3 -m pip install numpy fi