summaryrefslogtreecommitdiffstats
path: root/build/jenkins-build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'build/jenkins-build.sh')
-rwxr-xr-xbuild/jenkins-build.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh
index 20c97f3..ca5b57a 100755
--- a/build/jenkins-build.sh
+++ b/build/jenkins-build.sh
@@ -1,11 +1,10 @@
#!/usr/bin/env bash
-# TODO put git tag recognition
+
if [[ -n ${CIL_VERSION} ]]
then
echo Using defined version: $CIL_VERSION
else
-# TODO put git tag recognition, or default
- #export CIL_VERSION=0.10.4
+
#get tag, remove first char ('v') and leave rest
export CIL_VERSION=`git describe --tags | tail -c +2`
if [[ ${CIL_VERSION} == *"-"* ]]; then
@@ -36,7 +35,6 @@ fi
# presume that git clone is done before this script is launched, if not, uncomment
#git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit
conda install -y conda-build
-#export CIL_VERSION=0.10.2
#cd CCPi-Regularisation-Toolkit # already there by jenkins
# need to call first build
conda build Wrappers/Python/conda-recipe
@@ -50,7 +48,7 @@ if [[ -n ${CCPI_CONDA_TOKEN} ]]
then
conda install anaconda-client
while read -r outfile; do
- #TODO if git tag is defined than call anaconda without --label dev
+ #if 0 commit after tag then call anaconda without --label dev
#TODO if pull request??? do not upload
if [[ $CIL_VERSION == *"_"* ]]; then
# upload with dev label