diff options
| author | Luca Casonato <lucacasonato@yahoo.com> | 2021-01-19 13:53:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 13:53:23 +0100 |
| commit | cf3202644d99f57af3c1da169435f0d1cd8eadd8 (patch) | |
| tree | 24304809e25ee5f255116cab4e4ced3973d46897 | |
| parent | 867ce78fb662f8ed5cf9f4fbfa5bbb93a8fae6b0 (diff) | |
fix: full commit hash in canary compile download (#9166)
| -rw-r--r-- | cli/build.rs | 2 | ||||
| -rw-r--r-- | cli/tools/upgrade.rs | 4 | ||||
| -rw-r--r-- | cli/version.rs | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cli/build.rs b/cli/build.rs index 4d6295024..b23035717 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -221,7 +221,7 @@ fn git_commit_hash() -> String { .output() { if output.status.success() { - std::str::from_utf8(&output.stdout[..7]) + std::str::from_utf8(&output.stdout[..40]) .unwrap() .to_string() } else { diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs index ab49c06e9..e00127fa4 100644 --- a/cli/tools/upgrade.rs +++ b/cli/tools/upgrade.rs @@ -40,9 +40,7 @@ pub async fn upgrade_command( let install_version = match version { Some(passed_version) => { let current_is_passed = if canary { - let mut passed_hash = passed_version.clone(); - passed_hash.truncate(7); - crate::version::GIT_COMMIT_HASH == passed_hash + crate::version::GIT_COMMIT_HASH == passed_version } else if !crate::version::is_canary() { crate::version::deno() == passed_version } else { diff --git a/cli/version.rs b/cli/version.rs index ae2b961f2..6fe7da070 100644 --- a/cli/version.rs +++ b/cli/version.rs @@ -6,7 +6,7 @@ pub const TYPESCRIPT: &str = env!("TS_VERSION"); pub fn deno() -> String { let semver = env!("CARGO_PKG_VERSION"); option_env!("DENO_CANARY").map_or(semver.to_string(), |_| { - format!("{}+{}", semver, GIT_COMMIT_HASH) + format!("{}+{}", semver, &GIT_COMMIT_HASH[..7]) }) } |