From d5fbbc79a8dc8d2d20c4f351ce34e7046ad1b288 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Wed, 8 May 2019 09:37:49 +0200
Subject: [PATCH] Fixed conda version
---
.travis.yml | 2 +-
conda/recipe/meta.yaml | 2 +-
conda/run-conda-upload.sh | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e7f7503ec..559c345fd 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 1b326b73d..1dbecd9b0 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 03a3a2340..1bdb51d9e 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
--
GitLab