From 6c497653590f6c916496f1eb2f464d97d63b1ae9 Mon Sep 17 00:00:00 2001
From: Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk>
Date: Tue, 22 Jan 2019 11:57:50 +0000
Subject: Update jenkins-build.sh
---
build/jenkins-build.sh | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
(limited to 'build')
diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh
index ca5b57a..de22368 100755
--- a/build/jenkins-build.sh
+++ b/build/jenkins-build.sh
@@ -5,19 +5,19 @@ then
echo Using defined version: $CIL_VERSION
else
- #get tag, remove first char ('v') and leave rest
- export CIL_VERSION=`git describe --tags | tail -c +2`
- if [[ ${CIL_VERSION} == *"-"* ]]; then
- # detected dash means that it is dev version
- # version is then string-string and all after second dash is ignored (usually commit sha)
- export CIL_VERSION=`echo ${CIL_VERSION} | cut -d "-" -f -2`
- # but dash is prohibited for conda build
- export CIL_VERSION=`echo ${CIL_VERSION} | tr - _`
- echo Building dev version ${CIL_VERSION}
- else
- echo Defining version from last git tag and commit: $CIL_VERSION
- fi
-fi
+#get tag, remove first char ('v') and leave rest
+export CIL_VERSION=`git describe --tags | tail -c +2`
+if [[ ${CIL_VERSION} == *"-"* ]]; then
+ # detected dash means that it is dev version
+ # version is then string-string and all after second dash is ignored (usually commit sha)
+ export CIL_VERSION=`echo ${CIL_VERSION} | cut -d "-" -f -2`
+ # but dash is prohibited for conda build, replace with underscore
+ export CIL_VERSION=`echo ${CIL_VERSION} | tr - _`
+ echo Building dev version ${CIL_VERSION}
+else
+ echo Defining version from last git tag and commit: $CIL_VERSION
+fi
+
# Script to builds source code in Jenkins environment
# module try-load conda
--
cgit v1.2.3