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
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ jobs:
shell: bash
run: |
ls -lh build-ios-shared-sherpa-with-static-onnxruntime/
cd build-ios-shared-sherpa-with-static-onnxruntime/sherpa-onnx.xcframework
cd build-ios-shared-sherpa-with-static-onnxruntime/SherpaOnnxC.xcframework
du -h -d1 .
tree .

Expand All @@ -148,10 +148,10 @@ jobs:
mkdir -p /tmp/test-xcframework
cd /tmp/test-xcframework
unzip -o $GITHUB_WORKSPACE/build-ios-shared-sherpa-with-static-onnxruntime/*.xcframework.zip -d .
ls -lh sherpa-onnx.xcframework/
ls -lh SherpaOnnxC.xcframework/

# Verify xcframework structure (framework bundle)
fw_path=$(find sherpa-onnx.xcframework -path "*simulator*" -name "SherpaOnnxC.framework" -type d | head -1)
fw_path=$(find SherpaOnnxC.xcframework -path "*simulator*" -name "SherpaOnnxC.framework" -type d | head -1)
echo "fw_path: $fw_path"

test -f "$fw_path/SherpaOnnxC" || { echo "Binary not found"; exit 1; }
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-dart-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -945,9 +945,9 @@ jobs:
unzip sherpa-onnx-${SHERPA_ONNX_VERSION}-ios-shared-onnxruntime-static.xcframework.zip
rm sherpa-onnx-${SHERPA_ONNX_VERSION}-ios-shared-onnxruntime-static.xcframework.zip

mv sherpa-onnx.xcframework sherpa_onnx_ios/sherpa-onnx.xcframework
mv SherpaOnnxC.xcframework sherpa_onnx_ios/SherpaOnnxC.xcframework

ls -lh sherpa_onnx_ios/sherpa-onnx.xcframework/
ls -lh sherpa_onnx_ios/SherpaOnnxC.xcframework/

- name: Prepare for publish
shell: bash
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/test-flutter-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ jobs:
shell: bash
run: |
cd flutter-examples/hello_world
flutter pub get
flutter config --no-enable-swift-package-manager
flutter pub get
flutter build macos

ls -lh build/macos/Build/Products/Release/
Expand Down Expand Up @@ -141,8 +141,8 @@ jobs:
shell: bash
run: |
cd flutter-examples/hello_world
flutter pub get
flutter config --no-enable-swift-package-manager
flutter pub get
flutter build ios --no-codesign

ls -lh build/ios/iphoneos/
Expand Down Expand Up @@ -209,7 +209,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, ubuntu-24.04-arm]
# os: [ubuntu-latest, ubuntu-24.04-arm]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -309,7 +310,7 @@ jobs:
strategy:
fail-fast: false
matrix:
abi: [arm64-v8a, armeabi-v7a, x86_64, x86]
abi: [arm64, arm, x64]
steps:
- uses: actions/checkout@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-flutter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ jobs:
- name: Copy xcframework
shell: bash
run: |
cp -av build-ios-shared-sherpa-with-static-onnxruntime/sherpa-onnx.xcframework flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/sherpa-onnx.xcframework
ls -lh flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/sherpa-onnx.xcframework/
cp -av build-ios-shared-sherpa-with-static-onnxruntime/SherpaOnnxC.xcframework flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/SherpaOnnxC.xcframework
ls -lh flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/SherpaOnnxC.xcframework/

- name: Use local sherpa_onnx_ios
shell: bash
Expand Down Expand Up @@ -336,8 +336,8 @@ jobs:
- name: Copy xcframework
shell: bash
run: |
cp -av build-ios-shared-sherpa-with-static-onnxruntime/sherpa-onnx.xcframework flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/sherpa-onnx.xcframework
ls -lh flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/sherpa-onnx.xcframework/
cp -av build-ios-shared-sherpa-with-static-onnxruntime/SherpaOnnxC.xcframework flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/SherpaOnnxC.xcframework
ls -lh flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/SherpaOnnxC.xcframework/

- name: Use local sherpa_onnx_ios
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions build-ios-shared-sherpa-with-static-onnxruntime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ lipo \
-output \
ios-arm64_x86_64-simulator/libsherpa-onnx-c-api.dylib

rm -rf sherpa-onnx.xcframework
rm -rf SherpaOnnxC.xcframework

# Create framework bundles so SPM can resolve the module
create_framework() {
Expand Down Expand Up @@ -238,9 +238,9 @@ create_framework ios-arm64_x86_64-simulator/libsherpa-onnx-c-api.dylib ios-arm64
xcodebuild -create-xcframework \
-framework "ios-arm64/SherpaOnnxC.framework" \
-framework "ios-arm64_x86_64-simulator/SherpaOnnxC.framework" \
-output sherpa-onnx.xcframework
-output SherpaOnnxC.xcframework

cd sherpa-onnx.xcframework
cd SherpaOnnxC.xcframework
echo "PWD: $PWD"
ls -lh
echo "---"
Expand All @@ -250,7 +250,7 @@ cd ..

SHERPA_ONNX_VERSION=v$(grep "SHERPA_ONNX_VERSION" ../CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2)
rm -f sherpa-onnx-${SHERPA_ONNX_VERSION}-ios-shared-onnxruntime-static.xcframework.zip
zip -r -y sherpa-onnx-${SHERPA_ONNX_VERSION}-ios-shared-onnxruntime-static.xcframework.zip sherpa-onnx.xcframework
zip -r -y sherpa-onnx-${SHERPA_ONNX_VERSION}-ios-shared-onnxruntime-static.xcframework.zip SherpaOnnxC.xcframework

echo "Checksum:"
swift package compute-checksum sherpa-onnx-${SHERPA_ONNX_VERSION}-ios-shared-onnxruntime-static.xcframework.zip | tee checksum.txt
1 change: 1 addition & 0 deletions flutter/sherpa_onnx/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ homepage: https://github.com/k2-fsa/sherpa-onnx

environment:
sdk: ">=3.2.0 <4.0.0"
flutter: ">=3.10.0"

dependencies:
ffi: ^2.1.0
Expand Down
2 changes: 1 addition & 1 deletion flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ A new Flutter FFI plugin project.
s.source = { :path => '.' }
s.dependency 'Flutter'
s.platform = :ios, '13.0'
s.vendored_frameworks = 'sherpa_onnx_ios/sherpa-onnx.xcframework'
s.vendored_frameworks = 'sherpa_onnx_ios/SherpaOnnxC.xcframework'

# Flutter.framework does not contain a i386 slice.
s.pod_target_xcconfig = {
Expand Down
2 changes: 1 addition & 1 deletion flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
targets: [
.binaryTarget(
name: "SherpaOnnxC",
path: "sherpa-onnx.xcframework"
path: "SherpaOnnxC.xcframework"
),
.target(
name: "sherpa_onnx_ios",
Expand Down