Skip to content

Commit 2f5d317

Browse files
committed
Fix travisci status
1 parent 62e824a commit 2f5d317

3 files changed

Lines changed: 15 additions & 25 deletions

File tree

.travis.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ matrix:
99
apt:
1010
sources:
1111
- ubuntu-toolchain-r-test
12-
packages:
13-
- g++-6
14-
env: COMPILER=gcc GCC=6
12+
- os: osx
13+
osx_image: xcode8
14+
compiler: clang
1515
env:
1616
global:
1717
- MINCONDA_VERSION="latest"
1818
- MINCONDA_LINUX="Linux-x86_64"
1919
- MINCONDA_OSX="MacOSX-x86_64"
20-
# before_install:
21-
2220
install:
2321
# Define the version of miniconda to download
2422
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
@@ -28,20 +26,24 @@ install:
2826
fi
2927
- wget "http://repo.continuum.io/miniconda/Miniconda3-$MINCONDA_VERSION-$MINCONDA_OS.sh" -O miniconda.sh;
3028
- bash miniconda.sh -b -p $HOME/miniconda
29+
- export CONDA_PREFIX=$HOME/miniconda
3130
- export PATH="$HOME/miniconda/bin:$PATH"
3231
- hash -r
3332
- conda config --set always_yes yes --set changeps1 no
3433
- conda update -q conda
3534
- conda info -a
36-
# Start test environement
37-
- conda env create -f ./test/test-environment.yml
38-
- source activate test-xtensorio
39-
- export CC=$CONDA_PREFIX/bin/gcc
40-
- export CXX=$CONDA_PREFIX/bin/g++
41-
# from conda toolchain package
35+
- |
36+
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
37+
export CC=$CONDA_PREFIX/bin/gcc
38+
export CXX=$CONDA_PREFIX/bin/g++
39+
conda install gcc-7 -c QuantStack -c conda-forge
40+
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
41+
export CXX=clang++ CC=clang;
42+
conda install libcxx clangdev -c QuantStack -c conda-forge
43+
fi
44+
- conda install cmake openimageio libsndfile boost zlib xtensor=0.15.5 -c QuantStack -c conda-forge
4245
- export LDFLAGS="${LDFLAGS} -Wl,-rpath,$CONDA_PREFIX/lib"
4346
- export LINKFLAGS="${LDFLAGS}"
44-
# Testing
4547
- mkdir build
4648
- cd build
4749
- cmake -DBUILD_TESTS=ON -DDOWNLOAD_GTEST=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX ..;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Reading and writing image, sound and npz file formats to and from xtensor data s
2929
conda install xtensor-io -c QuantStack -c conda-forge
3030
```
3131

32-
- `xtensor-io` depends on `xtensor` `^0.13.2`.
32+
- `xtensor-io` depends on `xtensor` `^0.15.5`.
3333

3434
- `OpenImageIO`, `libsndfile` and `zlib` are optional dependencies to `xtensor-io`
3535

test/test-environment.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)