Skip to content

Temporarily remove building mac-catalyst targets to enable pipelines #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2022
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
8 changes: 4 additions & 4 deletions .github/workflows/build-libs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ jobs:
uses: actions/checkout@v3
with:
submodules: "true"
- name: Setup Xcode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
# - name: Setup Xcode version
# uses: maxim-lobanov/setup-xcode@v1
# with:
# xcode-version: latest-stable
- name: Run build script
run: ./devops/BuildLibraries.ps1 -Platform MacOS -OutLocation ./libs/macos
shell: pwsh
Expand Down
6 changes: 3 additions & 3 deletions devops/BuildLibraries.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ try {
cargo build --release --target x86_64-apple-ios
cargo build --release --target aarch64-apple-ios

cargo +nightly build --release -Z build-std --target x86_64-apple-ios-macabi
cargo +nightly build --release -Z build-std --target aarch64-apple-ios-macabi
# cargo +nightly build --release -Z build-std --target x86_64-apple-ios-macabi
# cargo +nightly build --release -Z build-std --target aarch64-apple-ios-macabi

# Create the fat binaries, cargo-lipo doesn't support ios sim aarch64
lipo -create "./target/x86_64-apple-ios/release/libokapi.a" "./target/aarch64-apple-ios-sim/release/libokapi.a" -output "$TargetOutput/libokapi_simulator.a"
lipo -create "./target/x86_64-apple-ios-macabi/release/libokapi.a" "./target/aarch64-apple-ios-macabi/release/libokapi.a" -output "$TargetOutput/libokapi_maccatalyst.a"
# lipo -create "./target/x86_64-apple-ios-macabi/release/libokapi.a" "./target/aarch64-apple-ios-macabi/release/libokapi.a" -output "$TargetOutput/libokapi_maccatalyst.a"
Copy-Item -Path "./target/aarch64-apple-ios/release/libokapi.a" -Destination "$TargetOutput/libokapi.a"
break
}
Expand Down