diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5955f46..3875286 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,6 +35,18 @@ jobs: gh release download v0.0.0-sidecar --repo fun0/meijiaka-zy --pattern "sidecar-binaries.tar.gz" --dir /tmp tar xzf /tmp/sidecar-binaries.tar.gz -C tauri-app/src-tauri/binaries/ chmod +x tauri-app/src-tauri/binaries/ffmpeg-* tauri-app/src-tauri/binaries/ffprobe-* + # Create universal binary for macOS universal-apple-darwin target + # by combining aarch64 and x86_64 binaries with lipo + if [ -f tauri-app/src-tauri/binaries/ffmpeg-aarch64-apple-darwin ] && [ -f tauri-app/src-tauri/binaries/ffmpeg-x86_64-apple-darwin ]; then + lipo -create \ + tauri-app/src-tauri/binaries/ffmpeg-aarch64-apple-darwin \ + tauri-app/src-tauri/binaries/ffmpeg-x86_64-apple-darwin \ + -output tauri-app/src-tauri/binaries/ffmpeg-universal-apple-darwin + lipo -create \ + tauri-app/src-tauri/binaries/ffprobe-aarch64-apple-darwin \ + tauri-app/src-tauri/binaries/ffprobe-x86_64-apple-darwin \ + -output tauri-app/src-tauri/binaries/ffprobe-universal-apple-darwin + fi env: GH_TOKEN: ${{ github.token }} @@ -101,4 +113,3 @@ jobs: name: windows-x64 path: | tauri-app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/*.exe - tauri-app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/msi/*.msi diff --git a/tauri-app/src-tauri/tauri.conf.json b/tauri-app/src-tauri/tauri.conf.json index 6b1bd98..3117903 100644 --- a/tauri-app/src-tauri/tauri.conf.json +++ b/tauri-app/src-tauri/tauri.conf.json @@ -49,7 +49,7 @@ }, "bundle": { "active": true, - "targets": "all", + "targets": ["nsis", "dmg", "app"], "externalBin": [ "binaries/ffmpeg", "binaries/ffprobe"