Merge pull request #24 from jhoblitt/tickets/DM-5179-conda-osx

update miniconda2 to 3.19.0.lsst4
lsst · Mar 16, 2016 · 236afa2 · 236afa2
2 parents 0fc2317 + 07cade5
commit 236afa2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,14 @@
 sudo: false
-language: python
+language: cpp
+os:
+  - linux
+  - osx
+# the default precise linux container has gcc 4.6
+sudo: required
+dist: trusty
+compiler:
+  - clang
+  - gcc
 script: |
   if [[ $BATCH == true ]]; then
     ./scripts/newinstall.sh -cb
@@ -9,6 +18,11 @@ script: |
 env:
   - BATCH=true
   - BATCH=false
+matrix:
+  # osx builds are often very slow to start due to high demand
+  fast_finish: true
+  allow_failures:
+    - os: osx
 notifications:
   email: false
   hipchat:

diff --git a/scripts/newinstall.sh b/scripts/newinstall.sh
@@ -33,7 +33,7 @@ EUPS_TARURL=${EUPS_TARURL:-"https://github.com/RobertLuptonTheGood/eups/archive/
 
 EUPS_PKGROOT=${EUPS_PKGROOT:-"http://sw.lsstcorp.org/eupspkg"}
 
-MINICONDA2_VERSION=${MINICONDA2_VERSION:-3.19.0.lsst3}
+MINICONDA2_VERSION=${MINICONDA2_VERSION:-3.19.0.lsst4}
 
 LSST_HOME="$PWD"