github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: remove the version number from the commit display message

Browse Source 
The displayed commit message and version message are partially duplicated.
Remove the version number from the commit display message.

Fixes:#5735

Signed-off-by: Chen Taotao <chentt10@chinatelecom.cn>
This commit is contained in:
Chen Taotao 2022-11-22 01:05:21 -08:00 committed by Chen TaoTao
parent f02bb1a9cb
commit 67fe703ff5
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime-rs/Makefile
View File

@ -290,9 +290,6 @@ COMMIT_NO := $(shell git rev-parse HEAD 2>/dev/null || true)
COMMIT := $(if $(shell git status --porcelain --untracked-files=no 2>/dev/null || true),${COMMIT_NO}-dirty,${COMMIT_NO}) COMMIT := $(if $(shell git status --porcelain --untracked-files=no 2>/dev/null || true),${COMMIT_NO}-dirty,${COMMIT_NO})
COMMIT_MSG = $(if $(COMMIT),$(COMMIT),unknown) COMMIT_MSG = $(if $(COMMIT),$(COMMIT),unknown)
# Exported to allow cargo to see it
export VERSION_COMMIT := $(if $(COMMIT),$(VERSION)-$(COMMIT),$(VERSION))
EXTRA_RUSTFEATURES := EXTRA_RUSTFEATURES :=
ifneq ($(EXTRA_RUSTFEATURES),) ifneq ($(EXTRA_RUSTFEATURES),)
@ -322,8 +319,8 @@ GENERATED_REPLACEMENTS= \
CONTAINERD_RUNTIME_NAME \ CONTAINERD_RUNTIME_NAME \
RUNTIME_VERSION \ RUNTIME_VERSION \
BINDIR \ BINDIR \
COMMIT \ COMMIT
VERSION_COMMIT
GENERATED_FILES := GENERATED_FILES :=
GENERATED_FILES += $(GENERATED_CODE) GENERATED_FILES += $(GENERATED_CODE)

2
src/runtime-rs/crates/shim/src/bin/main.rs
View File

@ -99,7 +99,7 @@ fn show_version(err: Option<anyhow::Error>) {
config::PROJECT_NAME, config::PROJECT_NAME,
config::CONTAINERD_RUNTIME_NAME, config::CONTAINERD_RUNTIME_NAME,
config::RUNTIME_VERSION, config::RUNTIME_VERSION,
config::RUNTIME_VERSION_COMMIT, config::RUNTIME_GIT_COMMIT,
); );
if let Some(err) = err { if let Some(err) = err {

1
src/runtime-rs/crates/shim/src/config.rs.in
View File

@ -9,7 +9,6 @@
pub const PROJECT_NAME: &str = "@PROJECT_NAME@"; pub const PROJECT_NAME: &str = "@PROJECT_NAME@";
pub const RUNTIME_VERSION: &str = "@RUNTIME_VERSION@"; pub const RUNTIME_VERSION: &str = "@RUNTIME_VERSION@";
pub const RUNTIME_VERSION_COMMIT: &str = "@VERSION_COMMIT@";
pub const RUNTIME_GIT_COMMIT: &str = "@COMMIT@"; pub const RUNTIME_GIT_COMMIT: &str = "@COMMIT@";
pub const RUNTIME_NAME: &str = "@RUNTIME_NAME@"; pub const RUNTIME_NAME: &str = "@RUNTIME_NAME@";
pub const CONTAINERD_RUNTIME_NAME: &str = "@CONTAINERD_RUNTIME_NAME@"; pub const CONTAINERD_RUNTIME_NAME: &str = "@CONTAINERD_RUNTIME_NAME@";