diff --git a/.travis.yml b/.travis.yml index e7f7503ec4b99c7f6e4b5bb8b58e691c8aef0b88..559c345fd624bc97dc54bdf2ce20250a69acb8fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -264,4 +264,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 make -C conda upload ; fi + - if test -n "$PLUMED_CONDA" && test -n "$TRAVIS_TAG" ; then VERSION="$TRAVIS_TAG" make -C conda upload ; fi diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml index 1b326b73db7ba020d69b48cd202e2e0a0d961dd8..1dbecd9b0527e7f7e2f61c8354820c265eeef835 100644 --- a/conda/recipe/meta.yaml +++ b/conda/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "plumed2" %} -{% set version = "2.5" %} +{% set version = environ['VERSION'] %} package: name: {{ name|lower }} diff --git a/conda/run-conda-upload.sh b/conda/run-conda-upload.sh index 03a3a2340e419b293fbf851a37a00337f684a685..1bdb51d9ef097e8fd9098bf390c23acf3591c0c3 100644 --- a/conda/run-conda-upload.sh +++ b/conda/run-conda-upload.sh @@ -13,7 +13,6 @@ else fi export PATH="$CONDA_HOME/bin:$PATH" -export VERSION=$TRAVIS_TAG # Disabled because it fails if [[ -n "$CONDA_UPLOAD_TOKEN" ]]; then