Merge pull request #474 from padloc/fix/tauri-v1.0.0

Fix Tauri building and publishing

.github/workflows/build-tauri.yml

@@ -39,8 +39,6 @@ jobs:
               uses: actions-rs/toolchain@v1
               with:
                   toolchain: stable
-            - name: Install tauri bundler
-              run: cargo install tauri-bundler --force
             - name: Install webkit2gtk (ubuntu only)
               if: matrix.platform == 'ubuntu-latest'
               run: |
@@ -69,33 +67,33 @@ jobs:
               if: matrix.platform == 'ubuntu-latest'
               with:
                   name: padloc-linux-${{ github.sha }}-unsigned.AppImage
-                  path: packages/tauri/src-tauri/target/release/bundle/appimage/padloc*.AppImage
+                  path: packages/tauri/src-tauri/target/debug/bundle/appimage/padloc*.AppImage
                   if-no-files-found: error
             - name: Archive deb
               uses: actions/upload-artifact@v2
               if: matrix.platform == 'ubuntu-latest'
               with:
                   name: padloc-linux-${{ github.sha }}-unsigned.deb
-                  path: packages/tauri/src-tauri/target/release/bundle/deb/*.deb
+                  path: packages/tauri/src-tauri/target/debug/bundle/deb/*.deb
                   if-no-files-found: error
             - name: Archive dmg
               uses: actions/upload-artifact@v2
               if: matrix.platform == 'macos-latest'
               with:
                   name: padloc-macos-${{ github.sha }}-unsigned.dmg
-                  path: packages/tauri/src-tauri/target/release/bundle/dmg/*.dmg
+                  path: packages/tauri/src-tauri/target/debug/bundle/dmg/*.dmg
                   if-no-files-found: error
             - name: Archive app
               uses: actions/upload-artifact@v2
               if: matrix.platform == 'macos-latest'
               with:
                   name: padloc-macos-${{ github.sha }}-unsigned.app
-                  path: packages/tauri/src-tauri/target/release/bundle/macos/*.app
+                  path: packages/tauri/src-tauri/target/debug/bundle/macos/*.app
                   if-no-files-found: error
             - name: Archive msi
               uses: actions/upload-artifact@v2
               if: matrix.platform == 'windows-latest'
               with:
                   name: padloc-windows-${{ github.sha }}-unsigned.msi
-                  path: packages/tauri/src-tauri/target/release/bundle/msi/*.msi
+                  path: packages/tauri/src-tauri/target/debug/bundle/msi/*.msi
                   if-no-files-found: error

.github/workflows/publish-release.yml

@@ -160,8 +160,6 @@ jobs:
               uses: actions-rs/toolchain@v1
               with:
                   toolchain: stable
-            - name: Install tauri bundler
-              run: cargo install tauri-bundler --force
             - name: Install webkit2gtk (ubuntu only)
               if: matrix.platform == 'ubuntu-latest'
               run: |

package.json

@@ -48,8 +48,8 @@
         "dev": "lerna run --parallel --scope '@padloc/{server,pwa}' --parallel dev",
         "tauri:dev": "lerna run --parallel --scope '@padloc/{server,tauri}' --parallel dev",
         "tauri:update": "lerna run update",
-        "tauri:build": "lerna run build:production",
-        "tauri:build:debug": "lerna run build --scope @padloc/tauri",
+        "tauri:build": "lerna run build --scope @padloc/tauri",
+        "tauri:build:debug": "lerna run build:debug",
         "repl": "cd packages/server && npm run repl && cd ../..",
         "test": "lerna run test",
         "test:e2e": "concurrently --prefix=name --prefix-length=30 --kill-others --success=first -n app,v3-app,maildev,cypress \"PL_DATA_BACKEND=memory PL_DISABLE_SW=true PL_EMAIL_BACKEND=smtp PL_EMAIL_SMTP_HOST=localhost PL_EMAIL_SMTP_PORT=1025 PL_EMAIL_SMTP_IGNORE_TLS=true npm start\" \"npm run start:v3\" \"npx maildev\" \"./node_modules/.bin/wait-on tcp:localhost:8080 && CYPRESS_CRASH_REPORTS=0 cypress run\"",

packages/tauri/package.json

@@ -17,8 +17,8 @@
     "license": "GPL-3.0",
     "devDependencies": {
         "@iarna/toml": "2.2.5",
-        "@tauri-apps/cli": "1.0.0-rc.10",
-        "@tauri-apps/tauricon": "github:tauri-apps/tauricon",
+        "@tauri-apps/cli": "1.0.0",
+        "@tauri-apps/tauricon": "1.0.2",
         "clean-webpack-plugin": "3.0.0",
         "css-loader": "5.2.6",
         "dotenv": "10.0.0",
@@ -36,7 +36,7 @@
     "dependencies": {
         "@padloc/app": "4.0.0",
         "@padloc/core": "4.0.0",
-        "@tauri-apps/api": "1.0.0-rc.5"
+        "@tauri-apps/api": "1.0.1"
     },
     "engines": {
         "node": "16.13.1",

packages/tauri/src-tauri/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 build = "src/build.rs"
 
 [build-dependencies.tauri-build]
-version = "1.0.0-beta.4"
+version = "1.0.0"
 features = [ ]
 
 [dependencies]
@@ -21,7 +21,7 @@ serde_json = "1.0"
   features = [ "derive" ]
 
   [dependencies.tauri]
-  version = "1.0.0-rc.4"
+  version = "1.0.0"
   features = [ "updater" ]
 
 [features]