From ac0f8b58b49798bf02cf2e9674da27e83cc8d011 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Wed, 8 May 2019 09:56:15 +0200
Subject: [PATCH] fix
---
.travis.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fd19c2d55..84e28ec72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -221,7 +221,8 @@ script:
fi
# build conda package
- - if test -n "$PLUMED_CONDA" ; then VERSION="${TRAVIS_TAG:-unspecified}" make -C conda ; fi
+ - if test -n "${TRAVIS_TAG}" ; then CONDA_VERSION="${TRAVIS_TAG//-/_}" ; else CONDA_VERSION=unspecified ; fi
+ - if test -n "$PLUMED_CONDA" ; then VERSION="$CONDA_VERSION" make -C conda ; fi
# build docker container
- if test "$PLUMED_DOCKER" = yes ; then make -C docker ; fi
@@ -264,4 +265,4 @@ after_success:
- if test "$MAKECOVERAGE" == yes ; then ./.travis/push coverage ; fi
- if test "$MAKECOVERAGE" == yes ; then bash <(curl -s https://codecov.io/bash) > /dev/null ; fi
# upload conda package
- - if test -n "$PLUMED_CONDA" && test -n "$TRAVIS_TAG" ; then VERSION="$TRAVIS_TAG" make -C conda upload ; fi
+ - if test -n "$PLUMED_CONDA" && test -n "$TRAVIS_TAG" ; then VERSION="$CONDA_VERSION" make -C conda upload ; fi
--
GitLab