Unverified Commit 3f2515da authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #129 from jlaura/dev 

Adds in check for PR for upload
parents de2057df 01cdda32

.travis.yml

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ matrix: 
        - MATRIX_EVAL="CXX=clang++ && CC=clang"



before_install:

  - echo "$TRAVIS_PULL_REQUEST"

  - eval "${MATRIX_EVAL}"

  - |

    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
@@ -58,8 +59,8 @@ after_success: 
  - builddir=(`conda build recipe --output`)

  # Label based on the branch and upload to anaconda.org

  - |

    if [ "$TRAVIS_BRANCH" == "master" ]; then

    if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

      anaconda -t="$CONDA_UPLOAD_TOKEN" upload $builddir;

    elif [ "$TRAVIS_BRANCH" == "dev" ]; then

    elif [ "$TRAVIS_BRANCH" == "dev" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

      anaconda -t="$CONDA_UPLOAD_TOKEN" upload $builddir --label dev --force;

    fi