Try iphonesimulator build in CI (#8)

* Try iphonesimulator build in CI

* Finally figure out include, library, and framework search paths

* Add debugging

* Fix typo

* Add sim target

* Add it to the right target

.github/workflows/build.yml

@@ -146,7 +146,7 @@ jobs:
           rustup update --no-self-update ${{ matrix.rust }} \
           && rustup default ${{ matrix.rust }} \
           && rustup component add clippy \
-          && rustup target add aarch64-apple-ios aarch64-apple-darwin x86_64-apple-ios x86_64-apple-darwin \
+          && rustup target add aarch64-apple-ios-sim aarch64-apple-ios aarch64-apple-darwin x86_64-apple-ios x86_64-apple-darwin \
           && cargo install cargo-lipo
 
       - uses: actions/cache@v3

apple/build-rust.sh

@@ -4,42 +4,53 @@
 # We call this from an Xcode run script.
 ##################################################
 
-set -e
+set -ex
 
 if [[ -z "$PROJECT_DIR" ]]; then
-    echo "Must provide PROJECT_DIR environment variable set to the Xcode project directory." 1>&2
-    exit 1
+  echo "Must provide PROJECT_DIR environment variable set to the Xcode project directory." 1>&2
+  exit 1
 fi
 
 cd $PROJECT_DIR
 
+# Default PLATFORM_NAME to macosx if not set.
+: "${PLATFORM_NAME:=macosx}"
+
+
 export PATH="$HOME/.cargo/bin:$PATH"
 
-# Without this we can't compile on MacOS Big Sur
-# https://github.com/TimNN/cargo-lipo/issues/41#issuecomment-774793892
-if [[ -n "${DEVELOPER_SDK_DIR:-}" ]]; then
-  export LIBRARY_PATH="${DEVELOPER_SDK_DIR}/MacOSX.sdk/usr/lib:${LIBRARY_PATH:-}"
-fi
+base_dir=$(xcrun --sdk $PLATFORM_NAME --show-sdk-path)
+
+# See https://github.com/briansmith/ring/issues/1332
+export LIBRARY_PATH="${base_dir}/usr/lib"
+export INCLUDE_PATH="${base_dir}/usr/include"
+export CFLAGS="-L ${LIBRARY_PATH} -I ${INCLUDE_PATH}"
+export RUSTFLAGS="-C link-arg=-F$base_dir/System/Library/Frameworks"
 
 TARGETS=""
-if [[ "$PLATFORM_NAME" = "iphonesimulator" ]]; then
-    TARGETS="aarch64-apple-ios-sim,x86_64-apple-ios-sim"
+if [[ "$PLATFORM_NAME" = "macosx" ]]; then
+  TARGETS="aarch64-apple-darwin,x86_64-apple-darwin"
 else
-  if [[ "$PLATFORM_NAME" = "iphoneos" ]]; then
-    TARGETS="aarch64-apple-ios"
+  if [[ "$PLATFORM_NAME" = "iphonesimulator" ]]; then
+    TARGETS="aarch64-apple-ios-sim,x86_64-apple-ios"
   else
-    TARGETS="aarch64-apple-darwin,x86_64-apple-darwin"
+    if [[ "$PLATFORM_NAME" = "iphoneos" ]]; then
+      TARGETS="aarch64-apple-ios"
+    else
+      echo "Unsupported platform: $PLATFORM_NAME"
+      exit 1
+    fi
   fi
 fi
 
 # if [ $ENABLE_PREVIEWS == "NO" ]; then
 
   if [[ $CONFIGURATION == "Release" ]]; then
-      echo "BUIlDING FOR RELEASE ($TARGETS)"
+      echo "BUILDING FOR RELEASE ($TARGETS)"
 
       cargo lipo --release --manifest-path ./Cargo.toml  --targets $TARGETS
   else
-      echo "BUIlDING FOR DEBUG ($TARGETS)"
+      echo "BUILDING FOR DEBUG ($TARGETS)"
 
       cargo lipo --manifest-path ./Cargo.toml  --targets $TARGETS
   fi

apple/build-xcframework.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-for sdk in iphoneos macosx; do
+for sdk in macosx iphoneos iphonesimulator; do
   echo "Building for $sdk"
 
   xcodebuild archive \
@@ -15,11 +15,13 @@ done
 
 xcodebuild -create-xcframework \
   -framework ./connlib-iphoneos.xcarchive/Products/Library/Frameworks/connlib.framework \
+  -framework ./connlib-iphonesimulator.xcarchive/Products/Library/Frameworks/connlib.framework \
   -framework ./connlib-macosx.xcarchive/Products/Library/Frameworks/connlib.framework \
   -output ./Connlib.xcframework
 
 echo "Build successful. Removing temporary archives"
 rm -rf ./connlib-iphoneos.xcarchive
+rm -rf ./connlib-iphonesimulator.xcarchive
 rm -rf ./connlib-macosx.xcarchive
 
 echo "Computing checksum"