From 5ed9bf03e58059ca351de7c9079945462b0eb18d Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Thu, 29 Feb 2024 11:42:01 +0100 Subject: [PATCH] Etherlink: Fix missing commit in tez_kernelVersion --- etherlink/kernel_evm/kernel/build.rs | 10 +++++++--- .../docker-compose/evm_kernel_builder.Dockerfile | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/etherlink/kernel_evm/kernel/build.rs b/etherlink/kernel_evm/kernel/build.rs index 59360655dfd9..110c524ff182 100644 --- a/etherlink/kernel_evm/kernel/build.rs +++ b/etherlink/kernel_evm/kernel/build.rs @@ -6,9 +6,13 @@ use std::process::Command; fn main() { println!("cargo:rerun-if-changed=src/*"); - let git_hash = match Command::new("git").args(["rev-parse", "HEAD"]).output() { - Ok(output) => String::from_utf8(output.stdout).unwrap(), - Err(_) => env!("CI_COMMIT_SHA").to_string(), + let git_hash = match ( + option_env!("CI_COMMIT_SHA"), + Command::new("git").args(["rev-parse", "HEAD"]).output(), + ) { + (Some(commit), _) => commit.to_string(), + (_, Ok(output)) => String::from_utf8(output.stdout).unwrap(), + (None, Err(_)) => "unknown version".to_string(), }; println!("cargo:rustc-env=GIT_HASH={}", git_hash) } diff --git a/etherlink/scripts/docker-compose/evm_kernel_builder.Dockerfile b/etherlink/scripts/docker-compose/evm_kernel_builder.Dockerfile index f45582caef66..6b52ad8485ca 100644 --- a/etherlink/scripts/docker-compose/evm_kernel_builder.Dockerfile +++ b/etherlink/scripts/docker-compose/evm_kernel_builder.Dockerfile @@ -14,7 +14,7 @@ COPY kernels.mk etherlink.mk /build/ COPY src/kernel_sdk /build/src/kernel_sdk COPY etherlink /build/etherlink RUN make -f etherlink.mk build-deps -RUN make -f etherlink.mk EVM_CONFIG=${EVM_CONFIG} evm_installer.wasm +RUN make -f etherlink.mk EVM_CONFIG=${EVM_CONFIG} CI_COMMIT_SHA=${CI_COMMIT_SHA} evm_installer.wasm FROM ${BASE_IMAGE} COPY --from=kernel_build /build/*.wasm /kernel/ -- GitLab