From ba487ef0c3d199f48f482b387ce916a370fad18b Mon Sep 17 00:00:00 2001 From: 0o-de-lally <> Date: Sun, 19 Nov 2023 23:14:15 -0500 Subject: [PATCH] test release with homebrew --- .github/workflows/release.yaml | 7 +++++-- src-tauri/tauri.conf.canary.json | 15 +++++---------- src-tauri/tauri.conf.json | 15 +++++---------- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6c1630ad..58aca0de 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,6 +24,7 @@ jobs: # uses: mxschmitt/action-tmate@v3 # with: # detached: true + # Setup Rust - uses: dtolnay/rust-toolchain@1.70.0 with: @@ -48,9 +49,11 @@ jobs: ######## MAC ######## - - name: set the Mac compile target + - name: install gmp if: matrix.os == 'macos-11' - run: export CARGO_BUILD_TARGET='universal-apple-darwin' + run: > + brew reinstall gmp + brew --prefix ######## WIN ######## diff --git a/src-tauri/tauri.conf.canary.json b/src-tauri/tauri.conf.canary.json index 13671651..218e8574 100644 --- a/src-tauri/tauri.conf.canary.json +++ b/src-tauri/tauri.conf.canary.json @@ -32,12 +32,7 @@ "resources": [ "gmp.dll", "gmp.lib", - "libgmp-10.dll", - "libgmp.10.dylib", - "libgmp.dylib", - "libgmpxx.4.dylib", - "libgmpxx.dylib", - "libgmp.a" + "libgmp-10.dll" ], "externalBin": [], "copyright": "", @@ -49,10 +44,10 @@ }, "macOS": { "frameworks": [ - "./libgmp.10.dylib", - "./libgmp.dylib", - "./libgmpxx.4.dylib", - "./libgmpxx.dylib" + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmp.10.dylib", + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmp.dylib", + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmpxx.4.dylib", + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmpxx.dylib" ], "minimumSystemVersion": "", "exceptionDomain": "localhost", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index d76e8f83..377bd47c 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -32,12 +32,7 @@ "resources": [ "gmp.dll", "gmp.lib", - "libgmp-10.dll", - "libgmp.10.dylib", - "libgmp.dylib", - "libgmpxx.4.dylib", - "libgmpxx.dylib", - "libgmp.a" + "libgmp-10.dll" ], "externalBin": [], "copyright": "", @@ -49,10 +44,10 @@ }, "macOS": { "frameworks": [ - "./libgmp.10.dylib", - "./libgmp.dylib", - "./libgmpxx.4.dylib", - "./libgmpxx.dylib" + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmp.10.dylib", + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmp.dylib", + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmpxx.4.dylib", + "/opt/homebrew/Cellar/gmp/6.3.0/lib/libgmpxx.dylib" ], "minimumSystemVersion": "", "exceptionDomain": "localhost",