From f9ce251eda4d2be213cb2aca6f91a9ba0ca46dd7 Mon Sep 17 00:00:00 2001
From: Toni <toni.giorgino@gmail.com>
Date: Tue, 7 May 2019 23:08:52 +0200
Subject: [PATCH] tentative release protocol for conda: build+upload when on
 pre-release test- OR tags

---
 .travis.yml              | 2 ++
 conda/run-conda-build.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c84ce0155..c418edfd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,11 +85,13 @@ matrix:
       - $HOME/.macports-ci-ccache
 # linux conda package
   - os: linux
+    if: branch =~ ^test- OR tag IS present OR type IN(pull_request)
     dist: trusty
     sudo: required
     env: PLUMED_CONDA=yes
 # osx conda package
   - os: osx
+    if: branch =~ ^test- OR tag IS present OR type IN(pull_request)
     osx_image: xcode8.3
     env: PLUMED_CONDA=yes
 # I don't put any mpi variant with macports since it takes too long to compile
diff --git a/conda/run-conda-build.sh b/conda/run-conda-build.sh
index 557b43228..55de293e8 100644
--- a/conda/run-conda-build.sh
+++ b/conda/run-conda-build.sh
@@ -40,7 +40,7 @@ export VERSION=`date +%Y.%m.%d`
 
 # Disabled because it fails
 if [[ -n "$CONDA_UPLOAD_TOKEN" ]]; then
-    USER=tonigi			# fix this
+    USER=plumed  # the conda channel
     anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l testing \
 	     $CONDA_HOME/conda-bld/$TRAVIS_OS_NAME-64/plumed*.tar.bz2 --force
 fi
-- 
GitLab