Skip to content

chore: remove git branch from version string #6629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2025
Merged

chore: remove git branch from version string #6629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,6 @@ fn current_git_hash() -> Option<String> {
None
}

fn current_git_branch() -> Option<String> {
if option_env!("GIT_BRANCH") == None {
let commit = Command::new("git")
.arg("rev-parse")
.arg("--abbrev-ref")
.arg("HEAD")
.output();
if let Ok(commit) = commit {
if let Ok(commit) = String::from_utf8(commit.stdout) {
return Some(commit);
}
}
} else {
return option_env!("GIT_BRANCH").map(String::from);
}

None
}

fn is_working_tree_clean() -> bool {
let status = Command::new("git")
.arg("diff")
Expand Down
15 changes: 4 additions & 11 deletions stackslib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ extern crate stacks_common;
#[macro_use]
pub extern crate clarity;

use stacks_common::versions::{GIT_BRANCH, GIT_COMMIT, GIT_TREE_CLEAN, STACKS_NODE_VERSION};
use std::env::consts::{ARCH, OS};

use stacks_common::versions::{GIT_COMMIT, GIT_TREE_CLEAN, STACKS_NODE_VERSION};
pub use stacks_common::{address, codec, types, util};

#[macro_use]
Expand Down Expand Up @@ -82,19 +84,10 @@ const BUILD_TYPE: &str = "release";

pub fn version_string(pkg_name: &str, pkg_version: Option<&str>) -> String {
let pkg_version = pkg_version.unwrap_or(STACKS_NODE_VERSION);
let git_branch = GIT_BRANCH_ENV.unwrap_or_else(|| GIT_BRANCH.unwrap_or(""));
let git_commit = GIT_COMMIT_ENV.unwrap_or_else(|| GIT_COMMIT.unwrap_or(""));
let git_tree_clean = GIT_TREE_CLEAN_ENV.unwrap_or_else(|| GIT_TREE_CLEAN.unwrap_or(""));

format!(
"{} {} ({}:{}{}, {} build, {} [{}])",
pkg_name,
pkg_version,
git_branch,
git_commit,
git_tree_clean,
BUILD_TYPE,
std::env::consts::OS,
std::env::consts::ARCH
"{pkg_name} {pkg_version} ({git_commit}{git_tree_clean}, {BUILD_TYPE} build, {OS} [{ARCH}])"
)
}