diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 78c3e5bd441..1fbb343ae74 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -2,8 +2,8 @@ # Define custom utilities # Test for macOS with [ -n "$IS_MACOS" ] if [ -z "$IS_MACOS" ]; then - export MB_ML_LIBC=$(echo $AUDITWHEEL_POLICY | cut -f 1 -d _) - export MB_ML_VER="_"$(echo $AUDITWHEEL_POLICY | cut -f 2- -d _) + export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} + export MB_ML_VER=${AUDITWHEEL_POLICY:9} fi source wheels/multibuild/common_utils.sh PLAT=$CIBW_ARCHS source wheels/multibuild/library_builders.sh @@ -64,7 +64,7 @@ function build_brotli { curl -fsSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip untar pillow-depends-main.zip -if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then +if [[ -n "$IS_MACOS" ]]; then # webp, zstd, xz, libtiff, libxcb cause a conflict with building webp, libtiff, libxcb # libxdmcp causes an issue on macOS < 11 # curl from brew requires zstd, use system curl diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e149b1a68d8..f975a925a1c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -13,11 +13,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest] archs: [ x86_64 ] - include: - - os: macos-latest - archs: arm64 steps: - uses: actions/checkout@v4 with: