Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tauri v2 #267

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build
on:
push:
branches: [ tauri ]
branches: [ tauri_v2 ]

jobs:
build-tauri:
Expand All @@ -23,39 +23,27 @@ jobs:
node-version: 21

- name: install Rust
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@nightly

- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libx11-dev xorg-dev libglu1-mesa-dev libglib2.0-0 libgtk2.0-dev
sudo apt-get install -y libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf

- name: Cache cargo registry
uses: actions/cache@v3
- name: Setup Cargo dependency cache
uses: Swatinem/rust-cache@v2
with:
path: ~/.cargo/registry
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
- name: Cache cargo index
uses: actions/cache@v3
with:
path: ~/.cargo/git
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}

- name: Cache tauri build
uses: actions/cache@v3
with:
path: ./src-tauri/target
key: ${{ runner.os }}-tauri-build-target-${{ hashFiles('**/Cargo.lock') }}
shared-key: shared

- name: install app dependencies and build it
run: yarn && yarn build

- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}

- uses: actions/upload-artifact@v3
if: matrix.platform == 'ubuntu-latest'
Expand Down
18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "liquidlauncher",
"private": true,
"version": "0.2.1",
"version": "0.2.2",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -10,13 +10,17 @@
"tauri": "tauri"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^3.0",
"@tauri-apps/cli": "^1.5",
"svelte": "^4.1.2",
"vite": "^5.0"
"@tauri-apps/cli": "^2.0.0-beta",
"svelte": "^4.2",
"vite": "^5.0",
"@sveltejs/vite-plugin-svelte": "^3.0"
},
"dependencies": {
"@tauri-apps/api": "^1.5",
"nouislider": "^15.7.1"
"@tauri-apps/api": "^2.0.0-beta",
"@tauri-apps/plugin-process": "^2.0.0-beta",
"@tauri-apps/plugin-dialog": "^2.0.0-beta",
"@tauri-apps/plugin-shell": "^2.0.0-beta",
"@tauri-apps/plugin-updater": "^2.0.0-beta",
"nouislider": "^15.7"
}
}
1 change: 1 addition & 0 deletions public/img/icon/social/icon-discord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src-tauri/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Cargo
# will have compiled files and executables
/target/

/gen/
Loading
Loading