Skip to content

Commit cbe9496

Browse files
fix: use APP_VERSION env var for analytics app_version instead of git describe (#2219)
* fix: use APP_VERSION env var for analytics app_version instead of git describe Co-Authored-By: yujonglee <[email protected]> * fix --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: yujonglee <[email protected]>
1 parent e2b6933 commit cbe9496

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/analytics/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ description = ""
99

1010
[build-dependencies]
1111
tauri-plugin = { workspace = true, features = ["build"] }
12-
vergen-gix = { workspace = true, features = ["build"] }
1312

1413
[dev-dependencies]
1514
specta-typescript = { workspace = true }

plugins/analytics/build.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ const COMMANDS: &[&str] = &["event", "set_properties", "set_disabled", "is_disab
22

33
fn main() {
44
println!("cargo:rerun-if-env-changed=POSTHOG_API_KEY");
5+
println!("cargo:rerun-if-env-changed=APP_VERSION");
56

6-
let gitcl = vergen_gix::GixBuilder::default()
7-
.describe(true, true, Some("desktop_v*"))
8-
.build()
9-
.unwrap();
10-
vergen_gix::Emitter::default()
11-
.add_instructions(&gitcl)
12-
.unwrap()
13-
.emit()
14-
.unwrap();
7+
let app_version = match std::env::var("APP_VERSION") {
8+
Ok(v) if !v.is_empty() => v,
9+
_ => "dev".to_string(),
10+
};
11+
12+
println!("cargo:rustc-env=APP_VERSION={}", app_version);
1513

1614
tauri_plugin::Builder::new(COMMANDS).build();
1715
}

plugins/analytics/src/ext.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl<R: tauri::Runtime, T: tauri::Manager<R>> crate::AnalyticsPluginExt<R> for T
2121
&self,
2222
mut payload: hypr_analytics::AnalyticsPayload,
2323
) -> Result<(), crate::Error> {
24-
let app_version = env!("VERGEN_GIT_DESCRIBE");
24+
let app_version = env!("APP_VERSION");
2525
let app_identifier = self.config().identifier.clone();
2626
let git_hash = self.get_git_hash();
2727
let bundle_id = self.config().identifier.clone();

0 commit comments

Comments
 (0)