From c9ab7fa14fe8e8979574a4147e78d530c59af7f1 Mon Sep 17 00:00:00 2001 From: Nikita Galaiko Date: Mon, 20 Feb 2023 16:51:48 +0100 Subject: [PATCH] fix config path --- scripts/release.sh | 6 +++--- src-tauri/Cargo.lock | 38 ++++++++++++++++++++++++++++++++++++++ src-tauri/Cargo.toml | 2 +- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 9ac312b95..f3c48d9df 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -175,10 +175,10 @@ info " dist: $DIST" TMP_DIR="$(mktemp -d)" trap "rm -rf '$TMP_DIR'" exit -# update the version in the tauri config -jq '.package.version="'"$VERSION"'"' "$PWD/../src-tauri/tauri.conf.json" >"$TMP_DIR/tauri.conf.json" +# update the version in the tauri release config +jq '.package.version="'"$VERSION"'"' "$PWD/../src-tauri/tauri.conf.release.json" >"$TMP_DIR/tauri.conf.json" -# build the app +# build the app with release config tauri build --config "$TMP_DIR/tauri.conf.json" BUNDLE_DIR="$PWD/../src-tauri/target/release/bundle" diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 59936107f..c0a5585e0 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -77,6 +77,22 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "857253367827bd9d0fd973f0ef15506a96e79e41b0ad7aa691203a4e3214f6c8" +[[package]] +name = "attohttpc" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" +dependencies = [ + "flate2", + "http", + "log", + "native-tls", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] + [[package]] name = "atty" version = "0.2.14" @@ -1861,6 +1877,12 @@ dependencies = [ "windows-sys 0.36.1", ] +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + [[package]] name = "miniz_oxide" version = "0.6.2" @@ -3341,6 +3363,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" dependencies = [ "anyhow", + "attohttpc", + "base64 0.13.1", "cocoa", "dirs-next", "embed_plist", @@ -3353,6 +3377,7 @@ dependencies = [ "heck 0.4.0", "http", "ignore", + "minisign-verify", "objc", "once_cell", "open", @@ -3374,12 +3399,14 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", + "time", "tokio", "url", "uuid 1.3.0", "webkit2gtk", "webview2-com", "windows 0.39.0", + "zip", ] [[package]] @@ -4477,3 +4504,14 @@ dependencies = [ "smallvec", "thiserror", ] + +[[package]] +name = "zip" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 0575e74f2..77bb45e1e 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -15,7 +15,7 @@ tauri-build = { version = "1.2", features = [] } [dependencies] serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.2", features = ["dialog-open", "path-all", "shell-open", "system-tray", "window-start-dragging"] } +tauri = { version = "1.2", features = ["dialog-open", "path-all", "shell-open", "system-tray", "updater", "window-start-dragging"] } tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev", features = ["colored"] } log = "0.4.17"