From 71d2d61d33fe079bbfefece3b8e94bca22bac31e Mon Sep 17 00:00:00 2001 From: yiguolei <676222867@qq.com> Date: Thu, 13 Oct 2022 18:24:04 +0800 Subject: [PATCH] [chore](build release) remove doris home and user info from doris_be --version output (#13344) There will be personal info in doris_be --version, like this: doris-0.0.0-trunk RELEASE (build git://hk-dev01/mnt/disk2/ygl/code/github/apache-doris/be/../@8b7d928af26318f71098f1be2ab03ed83b1955fd) Built on Wed, 12 Oct 2022 18:36:44 CST by ygl@hk-dev01 Since we always not need this info, commit id is enough, I remove these redundant info, the new result is like this: doris-0.0.0-trunk RELEASE (build git://hk-dev01@8b7d928) Built on Thu, 13 Oct 2022 15:03:01 CST by hk-dev01 --- gensrc/script/gen_build_version.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/gensrc/script/gen_build_version.sh b/gensrc/script/gen_build_version.sh index 9bfa5b88ea..c2fc94fcf7 100755 --- a/gensrc/script/gen_build_version.sh +++ b/gensrc/script/gen_build_version.sh @@ -38,7 +38,6 @@ build_version="${build_version_prefix}-${build_version_major}.${build_version_mi unset LANG unset LC_CTYPE -user="$(whoami)" date="$(date +"%a, %d %b %Y %H:%M:%S %Z")" hostname="$(hostname)" @@ -58,21 +57,15 @@ if [[ -z "${DORIS_TEST_BINARY_DIR}" ]]; then fi cd "${DORIS_HOME}" -if [[ -d '.svn' ]]; then - revision=$(svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p') - short_revision="${revision}" - url=$(svn info | sed -n -e 's/^URL: \(.*\)/\1/p') - if echo "${url}" | grep '\/tags\/' >/dev/null; then - build_version="$(echo "${url}" | sed 's/.*_\([0-9-]\+\)_PD_BL.*/\1/g' | sed 's/-/\./g')" - fi -elif [[ -d '.git' ]]; then + +if [[ -d '.git' ]]; then revision="$(git log -1 --pretty=format:"%H")" short_revision="$(git log -1 --pretty=format:"%h")" - url="git://${hostname}${DORIS_HOME}" + url="git://${hostname}" else revision="Unknown" short_revision="${revision}" - url="file://${DORIS_HOME}" + url="file://${hostname}" fi cd "${cwd}" @@ -80,7 +73,7 @@ cd "${cwd}" build_hash="${url}@${revision}" build_short_hash="${short_revision}" build_time="${date}" -build_info="${user}@${hostname}" +build_info="${hostname}" if [[ -z "${JAVA_HOME}" ]]; then java_cmd="$(which java)"