From fca8cba0b621291bc895a98a4307c765ea3acc92 Mon Sep 17 00:00:00 2001 From: hellno Date: Tue, 22 Aug 2023 16:46:46 +0200 Subject: [PATCH] fix CI build --- .github/workflows/build.yaml | 6 +-- src-tauri/Cargo.lock | 100 +++++++++++++++++++++++++++++++++++ src-tauri/Cargo.toml | 2 +- src/pages/Home/index.tsx | 16 ++++-- 4 files changed, 115 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 691565d2..f6d3f764 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,6 +10,8 @@ on: jobs: build: + permissions: + contents: write strategy: fail-fast: true matrix: @@ -67,10 +69,8 @@ jobs: # APPLE_ID: ${{ secrets.APPLE_ID }} # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} with: - tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version + tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version releaseName: 'herocast v__VERSION__' - # releaseBody: 'See the assets to download this version and install.' - # releaseDraft: true prerelease: false - name: Upload release artifacts diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index ebf0dd7d..cc08e135 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1861,6 +1861,12 @@ dependencies = [ "uuid", ] +[[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.1" @@ -2033,6 +2039,17 @@ dependencies = [ "objc_exception", ] +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2660,6 +2677,30 @@ dependencies = [ "winreg 0.10.1", ] +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -3369,6 +3410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", + "base64 0.21.2", "bytes", "cocoa", "dirs-next", @@ -3384,6 +3426,7 @@ dependencies = [ "ico 0.2.0", "ignore", "infer 0.9.0", + "minisign-verify", "objc", "once_cell", "open", @@ -3393,6 +3436,7 @@ dependencies = [ "raw-window-handle", "regex", "reqwest", + "rfd", "semver", "serde", "serde_json", @@ -3407,12 +3451,14 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", + "time", "tokio", "url", "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", + "zip", ] [[package]] @@ -4218,6 +4264,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + [[package]] name = "windows" version = "0.39.0" @@ -4348,6 +4407,12 @@ version = "0.48.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde1bb55ae4ce76a597a8566d82c57432bc69c039449d61572a7a353da28f68c" +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + [[package]] name = "windows_aarch64_msvc" version = "0.39.0" @@ -4366,6 +4431,12 @@ version = "0.48.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1513e8d48365a78adad7322fd6b5e4c4e99d92a69db8df2d435b25b1f1f286d4" +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + [[package]] name = "windows_i686_gnu" version = "0.39.0" @@ -4384,6 +4455,12 @@ version = "0.48.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60587c0265d2b842298f5858e1a5d79d146f9ee0c37be5782e92a6eb5e1d7a83" +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + [[package]] name = "windows_i686_msvc" version = "0.39.0" @@ -4402,6 +4479,12 @@ version = "0.48.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224fe0e0ffff5d2ea6a29f82026c8f43870038a0ffc247aa95a52b47df381ac4" +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + [[package]] name = "windows_x86_64_gnu" version = "0.39.0" @@ -4432,6 +4515,12 @@ version = "0.48.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2093925509d91ea3d69bcd20238f4c2ecdb1a29d3c281d026a09705d0dd35f3d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + [[package]] name = "windows_x86_64_msvc" version = "0.39.0" @@ -4545,3 +4634,14 @@ checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 168f06ab..b26a9944 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -15,7 +15,7 @@ tauri-build = { version = "1.4.0", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.4.0", features = [ "devtools", "shell-open", "http-all", "system-tray", "icon-ico", "icon-png"] } +tauri = { version = "1.4.0", features = [ "updater", "devtools", "shell-open", "http-all", "system-tray", "icon-ico", "icon-png"] } # tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } # tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } # tauri-plugin-sql = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1", features= ["postgres"] } diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx index 1bc05e95..90dc470c 100644 --- a/src/pages/Home/index.tsx +++ b/src/pages/Home/index.tsx @@ -112,11 +112,14 @@ export default function Home() { {/* Sidebar component, swap this element with another sidebar if you like */}
- herocast + /> */} +

+ herocast +