Fixed conda version

plumed · May 8, 2019 · d5fbbc7 · d5fbbc7
1 parent 9d72305
commit d5fbbc7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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