feat: tauri v1 & build on 20.04 (#24)

Support older system. Also fix cache for tauri. Signed-off-by: Martichou <[email protected]>
Martichou · Mar 3, 2024 · 5516783 · 5516783
1 parent 783d443
commit 5516783
Show file tree

Hide file tree

Showing 11 changed files with 980 additions and 999 deletions.
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -31,12 +31,14 @@ jobs:
           cargo build
 
   build-tauri:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build-core
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          cache-directories: "${{ github.workspace }}/frontend/src-tauri/target"
       - uses: arduino/setup-protoc@v3
       - uses: pnpm/action-setup@v2
         with:
@@ -48,7 +50,10 @@ jobs:
       - name: Install Linux dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libjavascriptcoregtk-4.1-dev libdbus-1-dev libgtk-4-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libdbus-1-dev libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - name: GLIBC version
+        run: |
+          ldd --version
       - name: Build Vite + Tauri
         run: |
           cd ./frontend

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -57,6 +57,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          cache-directories: "${{ github.workspace }}/${{ matrix.directory }}/target"
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
       - name: Install dependencies
@@ -66,7 +68,7 @@ jobs:
       - name: Install Linux dependencies
         if: matrix.directory == './frontend/src-tauri'
         run: |
-          sudo apt-get install -y libjavascriptcoregtk-4.1-dev libdbus-1-dev libgtk-4-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
       - name: Clippy Check
         run: |
           cd ${{ matrix.directory }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,11 +12,13 @@ on:
 
 jobs:
   build-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          cache-directories: "${{ github.workspace }}/frontend/src-tauri/target"
       - uses: arduino/setup-protoc@v3
       - uses: pnpm/action-setup@v2
         with:
@@ -28,7 +30,7 @@ jobs:
       - name: Install Linux dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libjavascriptcoregtk-4.1-dev libdbus-1-dev libgtk-4-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libdbus-1-dev libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
       - name: Build Vite + Tauri
         run: |
           cd ./frontend

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,7 +1,6 @@
 {
   "name": "rquickshare",
   "private": true,
-  "version": "0.1.0",
   "type": "module",
   "scripts": {
     "dev": "cross-env RUST_BACKTRACE=1 concurrently -k \"tauri dev\" \"pnpm devtools\"",
@@ -19,16 +18,15 @@
   },
   "dependencies": {
     "@martichou/core_lib": "../core_lib",
-    "@tauri-apps/api": "2.0.0-beta.3",
-    "@tauri-apps/plugin-autostart": "2.0.0-beta.1",
-    "@tauri-apps/plugin-notification": "2.0.0-beta.1",
-    "@tauri-apps/plugin-store": "2.0.0-beta.1",
+    "@tauri-apps/api": "1.5.1",
+    "tauri-plugin-autostart-api": "github:tauri-apps/tauri-plugin-autostart#v1",
+    "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
     "vue": "3.3.11"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^1.6.2",
     "@tailwindcss/typography": "^0.5.10",
-    "@tauri-apps/cli": "2.0.0-beta.6",
+    "@tauri-apps/cli": "1.5.7",
     "@types/node": "20.10.4",
     "@vitejs/plugin-vue": "4.5.2",
     "@vue/devtools": "6.5.1",

diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml