From a08d2eee2b4adf0cdf6d9c8a475beff6ee1df29b Mon Sep 17 00:00:00 2001 From: crowlKats <13135287+crowlKats@users.noreply.github.com> Date: Wed, 25 Nov 2020 11:30:14 +0100 Subject: add canary versioning (#8480) --- cli/version.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'cli/version.rs') diff --git a/cli/version.rs b/cli/version.rs index 0f2a69a5c..70185c19e 100644 --- a/cli/version.rs +++ b/cli/version.rs @@ -1,9 +1,15 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -pub const DENO: &str = env!("CARGO_PKG_VERSION"); pub const GIT_COMMIT_HASH: &str = env!("GIT_COMMIT_HASH"); pub const TYPESCRIPT: &str = crate::js::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) + }) +} + pub fn v8() -> &'static str { deno_core::v8_version() } -- cgit v1.2.3