diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index fd8126c4b..739a73a8d 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -42,11 +42,10 @@ if [[ "$CIBW_PLATFORM" == "ios" ]]; then fi IOS_SDK_PATH=$(xcrun --sdk $IOS_SDK --show-sdk-path) + CMAKE_SYSTEM_NAME=iOS if [[ "$IOS_SDK" == "iphonesimulator" ]]; then - CMAKE_SYSTEM_NAME=iOS IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET-simulator else - CMAKE_SYSTEM_NAME=iOS IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET fi @@ -163,8 +162,6 @@ function build_zlib_ng { function build_brotli { if [ -e brotli-stamp ]; then return; fi - local name=brotli - local version=$BROTLI_VERSION local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz) (cd $out_dir \ && cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib $HOST_CMAKE_FLAGS . \ @@ -174,10 +171,8 @@ function build_brotli { function build_harfbuzz { if [ -e harfbuzz-stamp ]; then return; fi - local name=harfbuzz - local version=$HARFBUZZ_VERSION - python3 -m pip install --disable-pip-version-check meson ninja + python3 -m pip install meson ninja local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/harfbuzz-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) (cd $out_dir \ @@ -302,7 +297,7 @@ if [[ -n "$IS_MACOS" ]]; then # Ensure cmake is available, and that the default prefix used by CMake is # the build prefix - python3 -m pip install --disable-pip-version-check cmake + python3 -m pip install cmake export CMAKE_PREFIX_PATH=$BUILD_PREFIX if [[ -n "$IOS_SDK" ]]; then diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a0dc61a9d..64c52956e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -97,17 +97,14 @@ jobs: platform: ios os: macos-latest cibw_arch: arm64_iphoneos - iphoneos_deployment_target: "13.0" - name: "iOS arm64 simulator" platform: ios os: macos-latest cibw_arch: arm64_iphonesimulator - iphoneos_deployment_target: "13.0" - name: "iOS x86_64 simulator" platform: ios os: macos-13 cibw_arch: x86_64_iphonesimulator - iphoneos_deployment_target: "13.0" steps: - uses: actions/checkout@v4 with: @@ -135,7 +132,6 @@ jobs: CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }} - IPHONEOS_DEPLOYMENT_TARGET: ${{ matrix.iphoneos_deployment_target }} - uses: actions/upload-artifact@v4 with: