diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-22 12:01:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 12:01:27 +0000 |
| commit | 33a8d8c331efa050fe3591808942099f9646c389 (patch) | |
| tree | b66fa5579f4ca5c049707f1745aff2a8605a0f9c | |
| parent | 39dc8ebc5e4bbb3b4138156d21d2e970ece2fbc5 (diff) | |
| parent | 6c497653590f6c916496f1eb2f464d97d63b1ae9 (diff) | |
| download | regularization-33a8d8c331efa050fe3591808942099f9646c389.tar.gz regularization-33a8d8c331efa050fe3591808942099f9646c389.tar.bz2 regularization-33a8d8c331efa050fe3591808942099f9646c389.tar.xz regularization-33a8d8c331efa050fe3591808942099f9646c389.zip | |
Merge pull request #2 from TomasKulhanek/pr-test
Update jenkins-build.sh test
| -rwxr-xr-x | build/jenkins-build.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 4225db3..7d54d3a 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 |