diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69c0eaa..b18cfc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,19 +36,10 @@ jobs: with: toolchain: stable - # Change workdir to the `src-tauri` directory - - name: Change workdir - run: cd src-tauri + # Run our cargo commands in `src-tauri` directory + - name: Build And Test + run: >- + cd src-tauri && + cargo test && + cargo build --release - # we run our rust tests before the webdriver tests to avoid testing a broken application - - name: Cargo test - uses: actions-rs/cargo@v1 - with: - command: test - - # build a release build of our application to be used during our WebdriverIO tests - - name: Cargo build - uses: actions-rs/cargo@v1 - with: - command: build - args: --release diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index ac75238..14e0254 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -418,6 +418,9 @@ name = "bytes" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +dependencies = [ + "serde", +] [[package]] name = "cairo-rs" @@ -2102,6 +2105,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[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.7.4" @@ -3084,10 +3093,12 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "winreg 0.50.0", ] @@ -3701,6 +3712,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" dependencies = [ "anyhow", + "base64 0.21.7", + "bytes", "cocoa", "dirs-next", "dunce", @@ -3715,6 +3728,8 @@ dependencies = [ "heck 0.5.0", "http", "ignore", + "indexmap 1.9.3", + "minisign-verify", "nix 0.26.4", "notify-rust", "objc", @@ -3723,6 +3738,7 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "raw-window-handle", + "reqwest", "rfd", "semver", "serde", @@ -3738,12 +3754,14 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", + "time", "tokio", "url", "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", + "zip", ] [[package]] @@ -4449,6 +4467,19 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wayland-backend" version = "0.3.3" @@ -5275,6 +5306,17 @@ dependencies = [ "zvariant", ] +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + [[package]] name = "zvariant" version = "4.1.1" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 3e16556..0c92c36 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.5.3", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.7.0", features = [ "os-all", "notification-all", "dialog-confirm", "clipboard-all", "dialog-message", "dialog-ask"] } +tauri = { version = "1.7.0", features = [ "updater", "os-all", "notification-all", "dialog-confirm", "clipboard-all", "dialog-message", "dialog-ask"] } dirs = "5.0.1" reqwest = { version = "0.11.18", features = ["json"] } lazy_static = "1.5.0"