Skip to content

Commit

Permalink
all
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Nov 14, 2023
1 parent a0c9191 commit 104bebd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/wheels-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 104bebd

Please sign in to comment.