diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-05-16 15:55:36 +0200 |
|---|---|---|
| committer |   Chris Luke <chris_luke@cable.comcast.com> | 2016-05-16 14:43:20 +0000 |
| commit | 4e6be6847fb9ccc45440e37d4343a68634915b23 (patch) | |
| tree | 57a9e83e8d68841f0f809c19501d838622709a48 | |
| parent | 65fcd4d7372718d353143c4deec65fe8b8e36577 (diff) | |
Add build number to VPP version if BUILD_NUMBER var is set
Change-Id: I73ecc12224fdfb08b7aa6118761b368577ce33d5
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rwxr-xr-x | build-root/scripts/version | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build-root/scripts/version b/build-root/scripts/version index bbafb9bbf8f..bf7e31551b9 100755 --- a/build-root/scripts/version +++ b/build-root/scripts/version @@ -4,6 +4,10 @@ TAG=$(git describe | cut -d- -f1 | sed -e 's/^v//') ADD=$(git describe | cut -s -d- -f2) CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4) +if [ -n "${BUILD_NUMBER}" ]; then + BLD="~b${BUILD_NUMBER}" +fi + if [ "$1" = "rpm-version" ]; then echo ${TAG} exit @@ -12,12 +16,12 @@ fi if [ "$1" = "rpm-release" ]; then [ -z "${ADD}" ] && echo release && exit CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/') - echo ${ADD}~${CMT} + echo ${ADD}~${CMT}${BLD} exit fi if [ -n "${ADD}" ]; then - echo ${TAG}-${ADD}~${CMT} + echo ${TAG}-${ADD}~${CMT}${BLD} else echo ${TAG} fi |