diff --git a/build.rs b/build.rs index 4105170c..34d54253 100644 --- a/build.rs +++ b/build.rs @@ -27,8 +27,8 @@ fn main() -> Result<(), Box> { "pre-release".to_owned() }; - // Set a build-time `GIT_COMMIT_TIME` env var which includes the commit time. - let commit_time = env::var("GIT_COMMIT_TIME").unwrap_or_else(|_| { + // Set a build-time `SOURCE_DATE_EPOCH` env var which includes the commit time. + let commit_time = env::var("SOURCE_DATE_EPOCH").unwrap_or_else(|_| { Command::new("git") .arg("log") .arg("-1") @@ -47,7 +47,7 @@ fn main() -> Result<(), Box> { }); println!("cargo::rustc-env=RADICLE_VERSION={version}"); - println!("cargo::rustc-env=GIT_COMMIT_TIME={commit_time}"); + println!("cargo::rustc-env=SOURCE_DATE_EPOCH={commit_time}"); println!("cargo::rustc-env=GIT_HEAD={hash}"); Ok(()) diff --git a/build/Dockerfile b/build/Dockerfile index e6c13e4e..478f1012 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -8,6 +8,7 @@ ARG TZ ARG LC_ALL ARG SOURCE_DATE_EPOCH ARG RADICLE_VERSION +ARG GIT_HEAD # Copy cargo configuration we're going to use to specify compiler options. RUN mkdir -p .cargo && cp build/config.toml .cargo/config.toml diff --git a/build/build b/build/build index bffa352b..70bcd91a 100755 --- a/build/build +++ b/build/build @@ -44,6 +44,7 @@ main() { --build-arg TZ \ --build-arg LC_ALL \ --build-arg RADICLE_VERSION=$version \ + --build-arg GIT_HEAD=$rev \ --arch amd64 --tag $image -f ./build/Dockerfile - < $gitarchive echo "Creating container (radicle-build-container).." diff --git a/radicle-cli/src/main.rs b/radicle-cli/src/main.rs index 9a1c5f99..1a143863 100644 --- a/radicle-cli/src/main.rs +++ b/radicle-cli/src/main.rs @@ -13,7 +13,7 @@ pub const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); pub const RADICLE_VERSION: &str = env!("RADICLE_VERSION"); pub const DESCRIPTION: &str = "Radicle command line interface"; pub const GIT_HEAD: &str = env!("GIT_HEAD"); -pub const TIMESTAMP: &str = env!("GIT_COMMIT_TIME"); +pub const TIMESTAMP: &str = env!("SOURCE_DATE_EPOCH"); pub const VERSION: Version = Version { name: NAME, version: RADICLE_VERSION, diff --git a/radicle-node/src/lib.rs b/radicle-node/src/lib.rs index 8afed88b..ed47827b 100644 --- a/radicle-node/src/lib.rs +++ b/radicle-node/src/lib.rs @@ -24,7 +24,7 @@ pub const VERSION: Version = Version { name: env!("CARGO_PKG_NAME"), commit: env!("GIT_HEAD"), version: env!("RADICLE_VERSION"), - timestamp: env!("GIT_COMMIT_TIME"), + timestamp: env!("SOURCE_DATE_EPOCH"), }; pub mod prelude { diff --git a/radicle-remote-helper/src/git-remote-rad.rs b/radicle-remote-helper/src/git-remote-rad.rs index 3953374b..95a74fcb 100644 --- a/radicle-remote-helper/src/git-remote-rad.rs +++ b/radicle-remote-helper/src/git-remote-rad.rs @@ -7,7 +7,7 @@ pub const VERSION: Version = Version { name: "git-remote-rad", commit: env!("GIT_HEAD"), version: env!("RADICLE_VERSION"), - timestamp: env!("GIT_COMMIT_TIME"), + timestamp: env!("SOURCE_DATE_EPOCH"), }; fn main() {