From 1bab2d0b77bc52bbc83012a23a8d1940f93416ae Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Sat, 21 Jul 2018 12:22:27 -0400 Subject: [PATCH] build_tools/make_version: Get MAINLINE_BRANCH from .gitreview. Use .gitreview defaultbranch setting to determine the mainline branch. This allows the script to be used against other directories which might not be on the same defaultbranch. This can be used by CI scripts to report the testsuite version being used: ./build_tools/make_version ${TESTSUITE_DIR} Change-Id: Ifdad4a9d8a26138c41bc6b630ecc3e34ea1c2758 --- build_tools/make_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/make_version b/build_tools/make_version index 1fdc04c59b..ad9fb3f924 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -3,7 +3,6 @@ AWK=${AWK:-awk} GIT=${GIT:-git} GREP=${GREP:-grep} -MAINLINE_BRANCH=15 if [ -f ${1}/.version ]; then cat ${1}/.version @@ -101,6 +100,7 @@ elif [ -d ${1}/.git ]; then MODIFIED="" SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"` if [ -z "$SVN_REV" ]; then + MAINLINE_BRANCH=$(git config -f .gitreview --get gerrit.defaultbranch) VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null` if [ $? -ne 0 ]; then if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then