From cf9689e81bb69b7732a168463b17a47de1ef59a5 Mon Sep 17 00:00:00 2001 From: vagrant Date: Mon, 21 Jan 2019 15:28:12 +0000 Subject: UPDATE: conda build don't like dash in version --- build/jenkins-build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index d0e9c96..b64631f 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -12,6 +12,8 @@ else # 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 @@ -51,7 +53,7 @@ then while read -r outfile; do #TODO if git tag is defined than call anaconda without --label dev #TODO if pull request??? do not upload - if [[ $CIL_VERSION == *"-"*]]; then + if [[ $CIL_VERSION == *"_"*]]; then # upload with dev label anaconda -v -t ${CCPI_CONDA_TOKEN} upload $outfile --force --label dev else -- cgit v1.2.3