mirror of
https://github.com/outbackdingo/firezone.git
synced 2026-01-28 02:18:50 +00:00
chore(rust/gui-client): fix incorrect -modified in the Git version (#6597)
This is #3384 happening again CI debugging indicates that Cargo is adding a feature to Cargo.toml for some reason: https://github.com/firezone/firezone/actions/runs/10713137607/job/29704715158#step:10:40 So I'll have to give up on that clever thing of removing the Tauri `notification` feature on Windows where we don't use it, since Linux still uses it for now. --------- Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com> Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
This commit is contained in:
2
.github/workflows/_tauri.yml
vendored
2
.github/workflows/_tauri.yml
vendored
@@ -87,6 +87,8 @@ jobs:
|
||||
- name: Build release exe and MSI / deb
|
||||
# Signs the exe before bundling it into the MSI
|
||||
run: pnpm build
|
||||
- name: Ensure unmodified Git workspace
|
||||
run: git diff --exit-code
|
||||
# We need to sign the exe inside the MSI. Currently
|
||||
# we do this in a "beforeBundleCommand" hook in tauri.windows.conf.json.
|
||||
# But this will soon be natively supported in Tauri.
|
||||
|
||||
1
rust/Cargo.lock
generated
1
rust/Cargo.lock
generated
@@ -1907,6 +1907,7 @@ dependencies = [
|
||||
"secrecy",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"subtle",
|
||||
"tauri",
|
||||
"tauri-build",
|
||||
"tauri-runtime",
|
||||
|
||||
@@ -29,6 +29,9 @@ sadness-generator = "0.5.0"
|
||||
secrecy = { workspace = true }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
subtle = "2.5.0"
|
||||
# `notification` is not needed on Windows, but if we remove it, Tauri's bundler will just add it back. #6597
|
||||
tauri = { version = "1.7.1", features = [ "dialog", "icon-png", "notification", "shell-open-api", "system-tray" ] }
|
||||
tauri-runtime = "0.14.2"
|
||||
tauri-utils = "1.6.0"
|
||||
thiserror = { version = "1.0", default-features = false }
|
||||
@@ -43,12 +46,10 @@ uuid = { version = "1.10.0", features = ["v4"] }
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
dirs = "5.0.1"
|
||||
nix = { version = "0.29.0", features = ["user"] }
|
||||
tauri = { version = "1.7.1", features = [ "dialog", "icon-png", "notification", "shell-open-api", "system-tray" ] }
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
|
||||
[target.'cfg(target_os = "windows")'.dependencies]
|
||||
tauri = { version = "1.7.1", features = [ "dialog", "icon-png", "shell-open-api", "system-tray" ] }
|
||||
tauri-winrt-notification = "0.5.0"
|
||||
|
||||
[target.'cfg(target_os = "windows")'.dependencies.windows]
|
||||
|
||||
Reference in New Issue
Block a user