Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .github/workflows/wheels-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 . \
Expand All @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading