589c375 build: Update env vars for build process — heartwood

Radicle Heartwood Protocol & Stack

build: Update env vars for build process

cloudhead committed 1 year ago

commit 589c3756246eaa3cffad7ff07bd1ef07543c64c3
parent 6598e7745640cd060616230adc18e122af49343a

6 files changed +8 -6

modified build.rs

@@ -27,8 +27,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

         "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<dyn std::error::Error>> {

     });
     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(())

modified 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

modified 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).."

modified 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,

modified 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 {

modified 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() {