zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 15:44:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include commit hash in Nightly & Dev builds (#10054)

Browse Source 
Release Notes:

- N/A

<img width="1338" alt="image"
src="https://github.com/zed-industries/zed/assets/16290753/c8442dbe-d293-46ef-abb1-ed8a6d9bf37d">

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
This commit is contained in:
moshyfawn 2024-04-02 11:19:19 -04:00 committed by GitHub
parent 15ef3f3017
commit c62239e9f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/feedback/src/system_specs.rs
View File

@ -1,6 +1,6 @@
use gpui::AppContext; use gpui::AppContext;
use human_bytes::human_bytes; use human_bytes::human_bytes;
use release_channel::{AppVersion, ReleaseChannel}; use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
use serde::Serialize; use serde::Serialize;
use std::{env, fmt::Display}; use std::{env, fmt::Display};
use sysinfo::{MemoryRefreshKind, RefreshKind, System}; use sysinfo::{MemoryRefreshKind, RefreshKind, System};
@ -13,12 +13,13 @@ pub struct SystemSpecs {
os_version: Option<String>, os_version: Option<String>,
memory: u64, memory: u64,
architecture: &'static str, architecture: &'static str,
commit_sha: Option<String>,
} }
impl SystemSpecs { impl SystemSpecs {
pub fn new(cx: &AppContext) -> Self { pub fn new(cx: &AppContext) -> Self {
let app_version = AppVersion::global(cx).to_string(); let app_version = AppVersion::global(cx).to_string();
let release_channel = ReleaseChannel::global(cx).display_name(); let release_channel = ReleaseChannel::global(cx);
let os_name = cx.app_metadata().os_name; let os_name = cx.app_metadata().os_name;
let system = System::new_with_specifics( let system = System::new_with_specifics(
RefreshKind::new().with_memory(MemoryRefreshKind::everything()), RefreshKind::new().with_memory(MemoryRefreshKind::everything()),
@ -29,14 +30,21 @@ impl SystemSpecs {
.app_metadata() .app_metadata()
.os_version .os_version
.map(|os_version| os_version.to_string()); .map(|os_version| os_version.to_string());
let commit_sha = match release_channel {
ReleaseChannel::Dev | ReleaseChannel::Nightly => {
AppCommitSha::try_global(cx).map(|sha| sha.0.clone())
}
_ => None,
};
SystemSpecs { SystemSpecs {
app_version, app_version,
release_channel, release_channel: release_channel.display_name(),
os_name, os_name,
os_version, os_version,
memory, memory,
architecture, architecture,
commit_sha,
} }
} }
} }
@ -47,8 +55,14 @@ impl Display for SystemSpecs {
Some(os_version) => format!("OS: {} {}", self.os_name, os_version), Some(os_version) => format!("OS: {} {}", self.os_name, os_version),
None => format!("OS: {}", self.os_name), None => format!("OS: {}", self.os_name),
}; };
let app_version_information = let app_version_information = format!(
format!("Zed: v{} ({})", self.app_version, self.release_channel); "Zed: v{} ({})",
self.app_version,
match &self.commit_sha {
Some(commit_sha) => format!("{} {}", self.release_channel, commit_sha),
None => self.release_channel.to_string(),
}
);
let system_specs = [ let system_specs = [
app_version_information, app_version_information,
os_information, os_information,