Skip to content

Commit d15e86a

Browse files
authored
Update Tauri from v1 to v2 (#496)
* Upgrade tauri to v2 * update action and disable menu * Add args to workflow step in test.yml * Rename environment variables for Tauri signing * Change mainBinaryName from 'Cinny' to 'cinny' * Update linux file names to use 'Cinny' instead of 'cinny' * Upgrade Tauri action to v0.6.1 and fix targets Updated Tauri action version and corrected target specification.
1 parent cf839c0 commit d15e86a

File tree

16 files changed

+16968
-1444
lines changed

16 files changed

+16968
-1444
lines changed

.github/workflows/tauri.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ jobs:
2424
- name: Install tauri dependencies
2525
run: npm ci
2626
- name: Build desktop app with Tauri
27-
uses: tauri-apps/tauri-action@v0.5.14
27+
uses: tauri-apps/tauri-action@v0.6.1
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
31-
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
30+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
31+
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
3232
NODE_OPTIONS: "--max_old_space_size=4096"
33-
with:
34-
releaseId: ${{ github.event.release.upload_url }}
3533
- name: Get app version (windows)
3634
run: |
3735
$json = (Get-Content "src-tauri\tauri.conf.json" -Raw) | ConvertFrom-Json
@@ -75,31 +73,29 @@ jobs:
7573
- name: Install dependencies
7674
run: |
7775
sudo apt-get update
78-
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
76+
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
7977
- name: Install cinny dependencies
8078
run: cd cinny && npm ci
8179
- name: Install tauri dependencies
8280
run: npm ci
8381
- name: Build desktop app with Tauri
84-
uses: tauri-apps/tauri-action@v0.5.14
82+
uses: tauri-apps/tauri-action@v0.6.1
8583
env:
8684
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
88-
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
85+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
86+
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
8987
NODE_OPTIONS: "--max_old_space_size=4096"
90-
with:
91-
releaseId: ${{ github.event.release.upload_url }}
9288
- name: Get app version
9389
id: vars
9490
run: echo "tag=$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')" >> $GITHUB_OUTPUT
9591
- name: Move deb
96-
run: mv "src-tauri/target/release/bundle/deb/cinny_${{ steps.vars.outputs.tag }}_amd64.deb" "src-tauri/target/release/bundle/deb/Cinny_desktop-x86_64.deb"
92+
run: mv "src-tauri/target/release/bundle/deb/Cinny_${{ steps.vars.outputs.tag }}_amd64.deb" "src-tauri/target/release/bundle/deb/Cinny_desktop-x86_64.deb"
9793
- name: Move AppImage
98-
run: mv "src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage"
94+
run: mv "src-tauri/target/release/bundle/appimage/Cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage"
9995
- name: Move AppImage.tar.gz
100-
run: mv "src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz"
96+
run: mv "src-tauri/target/release/bundle/appimage/Cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz"
10197
- name: Move AppImage.tar.gz.sig
102-
run: mv "src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz.sig" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz.sig"
98+
run: mv "src-tauri/target/release/bundle/appimage/Cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz.sig" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz.sig"
10399
- name: Upload tagged release
104100
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836
105101
with:
@@ -125,20 +121,19 @@ jobs:
125121
- name: Install Rust stable
126122
uses: dtolnay/rust-toolchain@stable
127123
with:
128-
target: aarch64-apple-darwin,x86_64-apple-darwin
124+
targets: aarch64-apple-darwin,x86_64-apple-darwin
129125
- name: Install cinny dependencies
130126
run: cd cinny && npm ci
131127
- name: Install tauri dependencies
132128
run: npm ci
133129
- name: Build desktop app with Tauri
134-
uses: tauri-apps/tauri-action@v0.5.14
130+
uses: tauri-apps/tauri-action@v0.6.1
135131
env:
136132
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
137-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
138-
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
133+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
134+
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
139135
NODE_OPTIONS: "--max_old_space_size=4096"
140136
with:
141-
releaseId: ${{ github.event.release.upload_url }}
142137
args: "--target universal-apple-darwin"
143138
- name: Get app version
144139
id: vars

package-lock.json

Lines changed: 155 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)