diff --git a/conda/recipe/build.sh b/conda/recipe/build.sh index 4b0d7b78843dd3b79be62380ce45f7cc3506c506..ad1ffef9986911bddebcb864fd02e99e4178ee25 100644 --- a/conda/recipe/build.sh +++ b/conda/recipe/build.sh @@ -2,8 +2,10 @@ env | sort -# TG: The "disabled" features are workaround for possible conda+configure bugs in library -# search: building is ok but linking with the .so doesn't find them (in conda-forge). +# TG: The "disabled" features are workaround for possible +# conda+configure bugs in library search: building is ok but +# linking with the .so doesn't find them (in +# conda-forge). Possibly the LD path needs tweaks. # TODO: re-enable them and see. Also to do: install docs? diff --git a/conda/run-conda-build.sh b/conda/run-conda-build.sh index 71670f6cb9f129783be18862958ebfd0036c7ac7..557b43228f142222c96e198a00c45de7055368dd 100644 --- a/conda/run-conda-build.sh +++ b/conda/run-conda-build.sh @@ -39,7 +39,7 @@ ls -l $CONDA_HOME/conda-bld/$TRAVIS_OS_NAME-64 export VERSION=`date +%Y.%m.%d` # Disabled because it fails -if [[ -v CONDA_UPLOAD_TOKEN ]]; then +if [[ -n "$CONDA_UPLOAD_TOKEN" ]]; then USER=tonigi # fix this anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l testing \ $CONDA_HOME/conda-bld/$TRAVIS_OS_NAME-64/plumed*.tar.bz2 --force