diff --git a/.travis.yml b/.travis.yml index 55556ea26..13c130e49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,5 +27,3 @@ script: after_success: - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda-recipes/pcmdi_metrics/conda_upload.sh; fi - - diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh index c249ce355..335ccdffc 100644 --- a/conda-recipes/pcmdi_metrics/conda_upload.sh +++ b/conda-recipes/pcmdi_metrics/conda_upload.sh @@ -6,5 +6,18 @@ mkdir ~/conda-bld conda config --set anaconda_upload no export CONDA_BLD_PATH=~/conda-bld export VERSION=`date +%Y.%m.%d` -conda build . -anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-0.tar.bz2 --force + +#mkdir temp +mkdir -p temp/conda-recipes +git clone git://github.com/UV-CDAT/conda-recipes temp/conda-recipes +mkdir temp/conda-recipes/pcmdi_metrics +cp conda-recipes/pcmdi_metrics/build.sh conda-recipes/pcmdi_metrics/meta.yaml.in temp/conda-recipes/pcmdi_metrics +cd temp/conda-recipes + +python ./prep_for_build.py -v $VERSION +conda build pcmdi_metrics +anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-$VERSION-0.tar.bz2 --force + +python ./prep_for_build.py -v $VERSION -f nox +conda build pcmdi_metrics +anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-nox-$VERSION-0.tar.bz2 --force