From faba301d489bda8616c2e7a7cc48ec7a8df9ac8c Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 13 Feb 2024 11:55:00 -0700 Subject: [PATCH 1/5] fix: macos dynamic linking error preventing launch --- tauri-app/src-tauri/tauri.conf.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tauri-app/src-tauri/tauri.conf.json b/tauri-app/src-tauri/tauri.conf.json index dc61cbe17..2b034e8dd 100644 --- a/tauri-app/src-tauri/tauri.conf.json +++ b/tauri-app/src-tauri/tauri.conf.json @@ -35,10 +35,7 @@ "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico" - ], - "macOS": { - "signingIdentity": "-" - } + ] }, "security": { "csp": null From fdde7ed615949b42af49f8ba445aba4c625a7519 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 13 Feb 2024 12:56:22 -0700 Subject: [PATCH 2/5] build: add m1 runner to build tauri app --- .github/workflows/tauri-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml index d7f1d856e..82fa7d99f 100644 --- a/.github/workflows/tauri-release.yml +++ b/.github/workflows/tauri-release.yml @@ -15,6 +15,7 @@ jobs: matrix: platform: [ macos-latest, + macos-14, ubuntu-20.04 # Someone who cares can make windows work. # windows-latest From 899a78018067ad3ae91872f5424e27388b565eb9 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 13 Feb 2024 14:16:30 -0700 Subject: [PATCH 3/5] wip: run tauri build in branch ci --- .github/workflows/tauri-release.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml index 82fa7d99f..06349e6f3 100644 --- a/.github/workflows/tauri-release.yml +++ b/.github/workflows/tauri-release.yml @@ -1,10 +1,7 @@ name: 'publish' # This will trigger the action on each push to the `release` branch. -on: - push: - branches: - - main +on: [push] jobs: publish-tauri: @@ -61,4 +58,5 @@ jobs: tauriScript: 'nix develop .#tauri-shell --command cargo tauri' tagName: app-v__VERSION__-${{ github.sha }} # the action automatically replaces \_\_VERSION\_\_ with the app version releaseName: 'App v__VERSION__-${{ github.sha }}' - releaseBody: 'See the assets to download this version and install.' \ No newline at end of file + releaseBody: 'See the assets to download this version and install.' + releaseDraft: true \ No newline at end of file From efba343d9fc7f1f25a6bf9ff2e870914d02c0abe Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 13 Feb 2024 15:42:38 -0700 Subject: [PATCH 4/5] wip: test only build on macos-11 for older intel macs --- .github/workflows/tauri-release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml index 06349e6f3..7f6c6c7e1 100644 --- a/.github/workflows/tauri-release.yml +++ b/.github/workflows/tauri-release.yml @@ -11,11 +11,7 @@ jobs: fail-fast: false matrix: platform: [ - macos-latest, - macos-14, - ubuntu-20.04 - # Someone who cares can make windows work. - # windows-latest + macos-11, ] runs-on: ${{ matrix.platform }} From 2d9828521e05915fdb603f1ad90f78c5ffed3459 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 13 Feb 2024 16:39:32 -0700 Subject: [PATCH 5/5] revert: remove testing settings --- .github/workflows/tauri-release.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml index 7f6c6c7e1..be937a203 100644 --- a/.github/workflows/tauri-release.yml +++ b/.github/workflows/tauri-release.yml @@ -1,7 +1,10 @@ name: 'publish' # This will trigger the action on each push to the `release` branch. -on: [push] +on: + push: + branches: + - main jobs: publish-tauri: @@ -11,7 +14,11 @@ jobs: fail-fast: false matrix: platform: [ - macos-11, + macos-12, + macos-14, + ubuntu-20.04 + # Someone who cares can make windows work. + # windows-latest ] runs-on: ${{ matrix.platform }} @@ -54,5 +61,4 @@ jobs: tauriScript: 'nix develop .#tauri-shell --command cargo tauri' tagName: app-v__VERSION__-${{ github.sha }} # the action automatically replaces \_\_VERSION\_\_ with the app version releaseName: 'App v__VERSION__-${{ github.sha }}' - releaseBody: 'See the assets to download this version and install.' - releaseDraft: true \ No newline at end of file + releaseBody: 'See the assets to download this version and install.' \ No newline at end of file