Skip to content

Commit 0927a3a

Browse files
authored
Merge pull request #162 from JohanMabille/ci
Removes old clang compilers and adds recent ones
2 parents c30521b + cd2ecf2 commit 0927a3a

File tree

2 files changed

+42
-11
lines changed

2 files changed

+42
-11
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ install:
2424
- conda info -a
2525
- conda install gtest cmake -c conda-forge
2626
- conda install pytest numpy pybind11==2.2.1 -c conda-forge
27-
- conda install xtensor==0.17.0 -c QuantStack
27+
- conda install xtensor==0.17.3 -c QuantStack
2828
- "set PYTHONHOME=%MINICONDA%"
2929
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
3030
- nmake test_xtensor_python

.travis.yml

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: cpp
2-
dist: precise
2+
dist: trusty
33
matrix:
44
include:
55
- os: linux
@@ -31,28 +31,57 @@ matrix:
3131
apt:
3232
sources:
3333
- ubuntu-toolchain-r-test
34-
- llvm-toolchain-precise-3.6
3534
packages:
35+
- g++-6
36+
env: COMPILER=gcc GCC=6 PY=3
37+
- os: linux
38+
addons:
39+
apt:
40+
sources:
41+
- ubuntu-toolchain-r-test
42+
packages:
43+
- g++-4.9
3644
- clang-3.6
3745
env: COMPILER=clang CLANG=3.6 PY=3
3846
- os: linux
3947
addons:
4048
apt:
4149
sources:
4250
- ubuntu-toolchain-r-test
43-
- llvm-toolchain-precise-3.7
51+
- llvm-toolchain-trusty-3.9
52+
packages:
53+
- g++-4.9
54+
- clang-3.9
55+
env: COMPILER=clang CLANG=3.9 PY=3
56+
- os: linux
57+
addons:
58+
apt:
59+
sources:
60+
- ubuntu-toolchain-r-test
61+
- llvm-toolchain-trusty-4.0
4462
packages:
45-
- clang-3.7
46-
env: COMPILER=clang CLANG=3.7 PY=3
63+
- g++-4.9
64+
- clang-4.0
65+
env: COMPILER=clang CLANG=4.0 PY=3
66+
- os: linux
67+
addons:
68+
apt:
69+
sources:
70+
- ubuntu-toolchain-r-test
71+
- llvm-toolchain-trusty-5.0
72+
packages:
73+
- g++-4.9
74+
- clang-5.0
75+
env: COMPILER=clang CLANG=5.0 PY=3
4776
- os: linux
4877
addons:
4978
apt:
5079
sources:
5180
- ubuntu-toolchain-r-test
52-
- llvm-toolchain-precise-3.8
81+
- llvm-toolchain-trusty-6.0
5382
packages:
54-
- clang-3.8
55-
env: COMPILER=clang CLANG=3.8 PY=3
83+
- clang-6.0
84+
env: COMPILER=clang CLANG=6.0 PY=3
5685
- os: osx
5786
osx_image: xcode8
5887
compiler: clang
@@ -85,8 +114,10 @@ install:
85114
fi
86115
- if [[ "$PY" == "3" ]]; then
87116
wget "http://repo.continuum.io/miniconda/Miniconda3-$MINCONDA_VERSION-$MINCONDA_OS.sh" -O miniconda.sh;
117+
PY_EXE=$HOME/miniconda/bin/python3.6;
88118
else
89119
wget "http://repo.continuum.io/miniconda/Miniconda2-$MINCONDA_VERSION-$MINCONDA_OS.sh" -O miniconda.sh;
120+
PY_EXE=$HOME/miniconda/bin/python2.7;
90121
fi
91122
- bash miniconda.sh -b -p $HOME/miniconda
92123
- export PATH="$HOME/miniconda/bin:$PATH"
@@ -97,8 +128,8 @@ install:
97128
- conda info -a
98129
- conda install pytest numpy pybind11==2.2.1 -c conda-forge
99130
- conda install cmake gtest -c conda-forge
100-
- conda install xtensor==0.17.0 -c QuantStack
101-
- cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
131+
- conda install xtensor==0.17.3 -c QuantStack
132+
- cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
102133
- make -j2 test_xtensor_python
103134
- make install
104135

0 commit comments

Comments
 (0)