[Asterisk-code-review] build tools/make version: Get MAINLINE BRANCH from .gitreview. (asterisk[13])

Corey Farrell asteriskteam at digium.com
Sun Jul 22 11:27:07 CDT 2018


Corey Farrell has uploaded this change for review. ( https://gerrit.asterisk.org/9576


Change subject: build_tools/make_version: Get MAINLINE_BRANCH from .gitreview.
......................................................................

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
---
M build_tools/make_version
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/76/9576/1

diff --git a/build_tools/make_version b/build_tools/make_version
index fbff4ea..ad9fb3f 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=13
 
 if [ -f ${1}/.version ]; then
     cat ${1}/.version
@@ -101,6 +100,7 @@
     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

-- 
To view, visit https://gerrit.asterisk.org/9576
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdad4a9d8a26138c41bc6b630ecc3e34ea1c2758
Gerrit-Change-Number: 9576
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180722/70eb814f/attachment-0001.html>


More information about the asterisk-code-review mailing list