summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTomas Kulhanek <tomas.kulhanek@stfc.ac.uk>2019-01-22 11:57:50 +0000
committerGitHub <noreply@github.com>2019-01-22 11:57:50 +0000
commit6c497653590f6c916496f1eb2f464d97d63b1ae9 (patch)
treec039231e327a00d39a27b362c9da997ccd58db5c /build
parent60b4d51ce1cf19be2a3483232448ae227253614c (diff)
downloadregularization-6c497653590f6c916496f1eb2f464d97d63b1ae9.tar.gz
regularization-6c497653590f6c916496f1eb2f464d97d63b1ae9.tar.bz2
regularization-6c497653590f6c916496f1eb2f464d97d63b1ae9.tar.xz
regularization-6c497653590f6c916496f1eb2f464d97d63b1ae9.zip
Update jenkins-build.sh
Diffstat (limited to 'build')
-rwxr-xr-xbuild/jenkins-build.sh26
1 files changed, 13 insertions, 13 deletions
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