Fixes signature URLs and missing tag

.github/workflows/release-tauri.yml

@@ -6,13 +6,16 @@ on:
             environment:
                 type: environment
                 default: "Beta"
-
-    # TODO: Temporary, to force building
-    push:
+            version:
+                type: string
+                default: "0.0.1"
+                required: true
 
 jobs:
     release:
         environment: ${{ github.event.inputs.environment || 'Beta' }}
+        env:
+            RELEASE_VERSION: ${{ github.event.inputs.version || '0.0.1' }}
 
         strategy:
             fail-fast: false
@@ -40,6 +43,10 @@ jobs:
               run: |
                   npm i -g npm@8.2.0
                   npm ci
+            - uses: rickstaa/action-create-tag@v1
+              with:
+                  tag: "tauri-v${{ env.RELEASE_VERSION }}"
+                  message: "v${{ env.RELEASE_VERSION }}"
             - uses: tauri-apps/tauri-action@v0.2.0
               env:
                   PL_SERVER_URL: ${{ secrets.PL_SERVER_URL }}
@@ -47,8 +54,8 @@ jobs:
                   TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
                   TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
               with:
-                  tagName: tauri-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
-                  releaseName: "Padloc (Tauri Edition) v__VERSION__"
+                  tagName: tauri-v${{ env.RELEASE_VERSION }}
+                  releaseName: "Padloc (Tauri Edition) v${{ env.RELEASE_VERSION }}"
                   releaseBody: "WARNING: The builds in this release are experimental. Use at your own risk!"
                   releaseDraft: true
                   prerelease: true

.gitignore

@@ -27,3 +27,4 @@ packages/server/attachments
 packages/extension/dist
 packages/tauri/dist
 packages/tauri/src-tauri/icons
+packages/tauri/tauri-update.json

packages/tauri/generate-tauri-update-file.js

@@ -9,15 +9,15 @@ const tauriUpdate = {
     pub_date: "[DATE]",
     platforms: {
         darwin: {
-            signature: "[MACOS_SIGNATURE]",
+            signature: "https://github.com/padloc/padloc/releases/download/v[VERSION]/Padloc.app.tar.gz.sig",
             url: "https://github.com/padloc/padloc/releases/download/v[VERSION]/Padloc.app.tar.gz",
         },
         linux: {
-            signature: "[LINUX_SIGNATURE]",
+            signature: "https://github.com/padloc/padloc/releases/download/v[VERSION]/Padloc.AppImage.tar.gz.sig",
             url: "https://github.com/padloc/padloc/releases/download/v[VERSION]/Padloc.AppImage.tar.gz",
         },
         win64: {
-            signature: "[WINDOWS_SIGNATURE]",
+            signature: "https://github.com/padloc/padloc/releases/download/v[VERSION]/Padloc.x64.msi.zip.sig",
             url: "https://github.com/padloc/padloc/releases/download/v[VERSION]/Padloc.x64.msi.zip",
         },
     },
@@ -28,18 +28,14 @@ const package = JSON.parse(packageFileContents);
 
 const { version } = package;
 const now = new Date().toISOString();
-// TODO: Will know where these are set once we sign a release
-const darwinSignature = "";
-const linuxSignature = "";
-const windowsSignature = "";
 
 tauriUpdate.name = `v${version}`;
 tauriUpdate.pub_date = now;
-tauriUpdate.platforms.darwin.signature = darwinSignature;
 tauriUpdate.platforms.darwin.url = `https://github.com/padloc/padloc/releases/download/v${version}/Padloc.app.tar.gz`;
-tauriUpdate.platforms.linux.signature = linuxSignature;
+tauriUpdate.platforms.darwin.signature = `${tauriUpdate.platforms.darwin.url}.sig`;
 tauriUpdate.platforms.linux.url = `https://github.com/padloc/padloc/releases/download/v${version}/Padloc.AppImage.tar.gz`;
-tauriUpdate.platforms.win64.signature = windowsSignature;
+tauriUpdate.platforms.linux.signature = `${tauriUpdate.platforms.linux.url}.sig`;
 tauriUpdate.platforms.win64.url = `https://github.com/padloc/padloc/releases/download/v${version}/Padloc.x64.msi.zip`;
+tauriUpdate.platforms.win64.signature = `${tauriUpdate.platforms.win64.url}.sig`;
 
 writeFileSync(tauriUpdateFilePath, JSON.stringify(tauriUpdate, null, 4), "utf-8");

packages/tauri/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
     "package": {
         "productName": "Padloc",
-        "version": "0.1.0"
+        "version": "4.0.0"
     },
     "build": {
         "distDir": "../dist",