Unverified Commit 8bc68409 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #124 from jlaura/dev

Fixes #121
parents 1b88ea05 d9e90881
Loading
Loading
Loading
Loading
+16 −2
Original line number Diff line number Diff line
language: cpp
sudo: false

branches:
  only:
    - master
    - dev

matrix:
  include:
    - os: linux
@@ -47,5 +52,14 @@ after_success:
  - conda install -y -q conda-build anaconda-client
  # Pull the libcsm for the build from our anaconda channel
  - conda config --add channels usgs-astrogeology
  - conda config --set anaconda_upload yes
  - conda build --token $CONDA_UPLOAD_TOKEN recipe -q
  - conda config --set anaconda_upload no
  - conda build recipe -q
  # Get the conda build output dir
  - builddir=(`conda build recipe --output`)
  # Label based on the branch and upload to anaconda.org
  - |
    if [ "$TRAVIS_BRANCH" == "master" ]; then
      anaconda -t $CONDA_UPLOAD_TOKEN upload $builddir --label main;
    else
      anaconda -t $CONDA_UPLOAD_TOKEN upload $builddir --label dev;
    fi
 No newline at end of file