summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorvagrant <vagrant@localhost.localdomain>2019-01-21 15:28:12 +0000
committervagrant <vagrant@localhost.localdomain>2019-01-21 15:28:12 +0000
commitcf9689e81bb69b7732a168463b17a47de1ef59a5 (patch)
tree292ad388a896adbcf0316038583997e6299f50e3 /build
parent94d1e4b289d9e9ffbf69826337ea05e2a3bb0101 (diff)
downloadregularization-cf9689e81bb69b7732a168463b17a47de1ef59a5.tar.gz
regularization-cf9689e81bb69b7732a168463b17a47de1ef59a5.tar.bz2
regularization-cf9689e81bb69b7732a168463b17a47de1ef59a5.tar.xz
regularization-cf9689e81bb69b7732a168463b17a47de1ef59a5.zip
UPDATE: conda build don't like dash in version
Diffstat (limited to 'build')
-rwxr-xr-xbuild/jenkins-build.sh4
1 files changed, 3 insertions, 1 deletions
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