Skip to content

Commit b9dc2dc

Browse files
committed
build updates
1 parent 15fb473 commit b9dc2dc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ install:
1111
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OS=MacOSX; else export OS=Linux; fi
1212
- wget https://repo.continuum.io/miniconda/Miniconda3-4.2.12-$OS-x86_64.sh -O miniconda.sh
1313
- bash miniconda.sh -b -p $HOME/miniconda
14-
- export PATH="$HOME/miniconda/bin:$PATH" VERSION=$(git describe --tags) MACOSX_DEPLOYMENT_TARGET=10.9
14+
- export OLDPATH=$PATH PATH="$HOME/miniconda/bin:$PATH" VERSION=$(git describe --tags) MACOSX_DEPLOYMENT_TARGET=10.9
1515
- hash -r
1616
- conda config --set always_yes yes --set changeps1 no
1717
- conda update -q conda
@@ -26,6 +26,7 @@ install:
2626
- test/integration/test.sh `which smc++`
2727
- conda/template.py conda/construct.tpl $VERSION > conda/construct.yaml
2828
- source deactivate
29+
- export PATH=$OLDPATH # so it uses the correct curl binary to upload ccache
2930

3031
deploy:
3132
- provider: script

conda/meta.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ requirements:
2323
run:
2424
- conda
2525
- nomkl
26-
- gnuplot 5.0.5
26+
- gnuplot 4.6.0
2727
- python 3.5.2
2828
- libgcc 4.8.5
2929
- gmp 6.1.0

0 commit comments

Comments
 (0)