Skip to content

Commit 33c6884

Browse files
authored
Merge pull request #130 from Cysharp/feature/macOS-Universal
Build universal binary for macOS
2 parents fe8bae0 + 2917aed commit 33c6884

21 files changed

+60
-182
lines changed

.github/workflows/build-natives.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,24 @@ jobs:
206206
dotnet tool restore
207207
dotnet retest -- -c ${{ env._DOTNET_BUILD_CONFIG }} ../test/YetAnotherHttpHandler.Test
208208
209+
build-osx-universal:
210+
name: Build Native library (osx-universal)
211+
if: ${{ !inputs.build-only-linux }}
212+
needs: [ build-osx-x64, build-osx-arm64 ]
213+
runs-on: macos-latest
214+
timeout-minutes: 30
215+
steps:
216+
- uses: Cysharp/Actions/.github/actions/checkout@main
217+
- uses: Cysharp/Actions/.github/actions/download-artifact@main
218+
with:
219+
path: native/artifacts
220+
- run: lipo -create -output native/artifacts/yaha_native.bundle native/artifacts/osx-x64/libyaha_native.dylib native/artifacts/osx-arm64/libyaha_native.dylib
221+
- uses: Cysharp/Actions/.github/actions/upload-artifact@main
222+
with:
223+
name: osx-universal
224+
path: native/artifacts/yaha_native.bundle
225+
retention-days: 1
226+
209227
build-ios-x64:
210228
name: Build Native library (ios-x64)
211229
if: ${{ !inputs.build-only-linux }}
@@ -327,6 +345,7 @@ jobs:
327345
- build-linux-x64
328346
- build-osx-x64
329347
- build-osx-arm64
348+
- build-osx-universal
330349
- build-ios-x64
331350
- build-ios-arm64
332351
- build-android-arm

src/YetAnotherHttpHandler/Plugins/Cysharp.Net.Http.YetAnotherHttpHandler.Native/runtimes/osx-arm64/native/libCysharp.Net.Http.YetAnotherHttpHandler.Native.dylib.meta

Lines changed: 0 additions & 80 deletions
This file was deleted.

src/YetAnotherHttpHandler/Plugins/Cysharp.Net.Http.YetAnotherHttpHandler.Native/runtimes/osx-arm64.meta renamed to src/YetAnotherHttpHandler/Plugins/Cysharp.Net.Http.YetAnotherHttpHandler.Native/runtimes/osx-universal.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)