Skip to content

Commit 585b916

Browse files
author
RubioJr9
committed
Putting back test matrix
1 parent 3e9d40f commit 585b916

File tree

1 file changed

+43
-46
lines changed

1 file changed

+43
-46
lines changed

.travis.yml

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,53 @@ cache: ccache
33

44
matrix:
55
include:
6-
# - os: linux
7-
# dist: trusty
8-
# sudo: required
9-
# compiler: gcc
10-
# env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF QT5=ON
11-
# - os: linux
12-
# dist: trusty
13-
# sudo: required
14-
# compiler: gcc
15-
# env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF QT5=ON
16-
# - os: linux
17-
# dist: xenial
18-
# sudo: required
19-
# compiler: gcc
20-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
6+
- os: linux
7+
dist: trusty
8+
compiler: gcc
9+
env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF QT5=ON
10+
- os: linux
11+
dist: xenial
12+
compiler: gcc
13+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
2114
- os: linux
2215
dist: xenial
2316
compiler: clang
2417
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
25-
# - os: linux
26-
# dist: bionic
27-
# compiler: gcc
28-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
29-
# - os: osx
30-
# osx_image: xcode7.3
31-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
32-
# - os: osx
33-
# osx_image: xcode8.3
34-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
35-
# - os: osx
36-
# osx_image: xcode9.4
37-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
38-
# - os: osx
39-
# osx_image: xcode10.1
40-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
41-
# - os: osx
42-
# osx_image: xcode10.3
43-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
44-
# - os: osx
45-
# osx_image: xcode11
46-
# env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
47-
# - os: osx
48-
# osx_image: xcode7.2
49-
# env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=OFF
50-
# - os: osx
51-
# osx_image: xcode10.1
52-
# env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
53-
# - os: osx
54-
# osx_image: xcode11
55-
# env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
18+
- os: linux
19+
dist: xenial
20+
compiler: gcc
21+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
22+
- os: linux
23+
dist: bionic
24+
compiler: gcc
25+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
26+
- os: osx
27+
osx_image: xcode7.3
28+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
29+
- os: osx
30+
osx_image: xcode8.3
31+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
32+
- os: osx
33+
osx_image: xcode9.4
34+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
35+
- os: osx
36+
osx_image: xcode10.1
37+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=OFF
38+
- os: osx
39+
osx_image: xcode10.3
40+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
41+
- os: osx
42+
osx_image: xcode11
43+
env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF QT5=ON
44+
- os: osx
45+
osx_image: xcode7.2
46+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=OFF
47+
- os: osx
48+
osx_image: xcode10.1
49+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
50+
- os: osx
51+
osx_image: xcode11
52+
env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF QT5=ON
5653

5754
before_install:
5855
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then date -u; fi

0 commit comments

Comments
 (0)