Skip to content

Commit 72d20f8

Browse files
jotojoto
committed
Switch travis build to 'trusty'.
Some changes for the packages to be installed and the compiler versions available.
1 parent c480e68 commit 72d20f8

File tree

1 file changed

+65
-29
lines changed

1 file changed

+65
-29
lines changed

‎.travis.yml

+65-29
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ language: generic
88

99
sudo: false
1010

11+
dist: trusty
12+
1113
cache:
1214
directories:
1315
- $HOME/.ccache
@@ -26,51 +28,85 @@ matrix:
2628
compiler: linux-clang35-release
2729
addons:
2830
apt:
29-
sources: ['llvm-toolchain-precise-3.5', 'ubuntu-toolchain-r-test', 'boost-latest']
30-
packages: ['clang-3.5', 'cmake', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
31+
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
32+
packages: ['clang-3.5', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
3133
env: COMPILER='clang++-3.5' BUILD_TYPE='Release'
3234

3335
- os: linux
3436
compiler: linux-clang35-dev
3537
addons:
3638
apt:
37-
sources: ['llvm-toolchain-precise-3.5', 'ubuntu-toolchain-r-test', 'boost-latest']
38-
packages: ['clang-3.5', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
39+
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
40+
packages: ['clang-3.5', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
3941
env: COMPILER='clang++-3.5' BUILD_TYPE='Dev'
4042

4143

4244
- os: linux
43-
compiler: linux-clang37-release
45+
compiler: linux-clang38-release
4446
addons:
4547
apt:
46-
sources: ['llvm-toolchain-precise-3.7', 'ubuntu-toolchain-r-test', 'boost-latest']
47-
packages: ['clang-3.7', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
48-
env: COMPILER='clang++-3.7' BUILD_TYPE='Release'
48+
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
49+
packages: ['clang-3.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
50+
env: COMPILER='clang++-3.8' BUILD_TYPE='Release'
4951

5052
- os: linux
51-
compiler: linux-clang37-dev
53+
compiler: linux-clang38-dev
5254
addons:
5355
apt:
54-
sources: ['llvm-toolchain-precise-3.7', 'ubuntu-toolchain-r-test', 'boost-latest']
55-
packages: ['clang-3.7', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
56-
env: COMPILER='clang++-3.7' BUILD_TYPE='Dev'
56+
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
57+
packages: ['clang-3.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
58+
env: COMPILER='clang++-3.8' BUILD_TYPE='Dev'
5759

5860

5961
- os: linux
60-
compiler: linux-clang38-release
62+
compiler: linux-clang39-release
6163
addons:
6264
apt:
63-
sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test', 'boost-latest']
64-
packages: ['clang-3.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
65-
env: COMPILER='clang++-3.8' BUILD_TYPE='Release'
65+
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
66+
packages: ['clang-3.9', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
67+
env: COMPILER='clang++-3.9' BUILD_TYPE='Release'
6668

6769
- os: linux
68-
compiler: linux-clang38-dev
70+
compiler: linux-clang39-dev
6971
addons:
7072
apt:
71-
sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test', 'boost-latest']
72-
packages: ['clang-3.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
73-
env: COMPILER='clang++-3.8' BUILD_TYPE='Dev'
73+
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
74+
packages: ['clang-3.9', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
75+
env: COMPILER='clang++-3.9' BUILD_TYPE='Dev'
76+
77+
78+
- os: linux
79+
compiler: linux-clang40-release
80+
addons:
81+
apt:
82+
sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test', 'boost-latest']
83+
packages: ['clang-4.0', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
84+
env: COMPILER='clang++-4.0' BUILD_TYPE='Release'
85+
86+
- os: linux
87+
compiler: linux-clang40-dev
88+
addons:
89+
apt:
90+
sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test', 'boost-latest']
91+
packages: ['clang-4.0', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
92+
env: COMPILER='clang++-4.0' BUILD_TYPE='Dev'
93+
94+
95+
- os: linux
96+
compiler: linux-clang50-release
97+
addons:
98+
apt:
99+
sources: ['llvm-toolchain-trusty-5.0', 'ubuntu-toolchain-r-test', 'boost-latest']
100+
packages: ['clang-5.0', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
101+
env: COMPILER='clang++-5.0' BUILD_TYPE='Release'
102+
103+
- os: linux
104+
compiler: linux-clang50-dev
105+
addons:
106+
apt:
107+
sources: ['llvm-toolchain-trusty-5.0', 'ubuntu-toolchain-r-test', 'boost-latest']
108+
packages: ['clang-5.0', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
109+
env: COMPILER='clang++-5.0' BUILD_TYPE='Dev'
74110

75111

76112
# 2/ Linux GCC Builds
@@ -79,15 +115,15 @@ matrix:
79115
addons:
80116
apt:
81117
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
82-
packages: ['g++-4.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
118+
packages: ['g++-4.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
83119
env: COMPILER='g++-4.8' COMPILER_FLAGS='-Wno-return-type' BUILD_TYPE='Release'
84120

85121
- os: linux
86122
compiler: linux-gcc48-dev
87123
addons:
88124
apt:
89125
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
90-
packages: ['g++-4.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
126+
packages: ['g++-4.8', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
91127
env: COMPILER='g++-4.8' COMPILER_FLAGS='-Wno-return-type' BUILD_TYPE='Dev'
92128

93129

@@ -96,15 +132,15 @@ matrix:
96132
addons:
97133
apt:
98134
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
99-
packages: ['g++-4.9', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
135+
packages: ['g++-4.9', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
100136
env: COMPILER='g++-4.9' BUILD_TYPE='Release'
101137

102138
- os: linux
103139
compiler: linux-gcc49-dev
104140
addons:
105141
apt:
106142
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
107-
packages: ['g++-4.9', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
143+
packages: ['g++-4.9', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
108144
env: COMPILER='g++-4.9' BUILD_TYPE='Dev'
109145

110146

@@ -113,15 +149,15 @@ matrix:
113149
addons:
114150
apt:
115151
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
116-
packages: ['g++-5', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
152+
packages: ['g++-5', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
117153
env: COMPILER='g++-5' BUILD_TYPE='Release'
118154

119155
- os: linux
120156
compiler: linux-gcc5-dev
121157
addons:
122158
apt:
123159
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
124-
packages: ['g++-5', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
160+
packages: ['g++-5', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
125161
env: COMPILER='g++-5' BUILD_TYPE='Dev'
126162

127163

@@ -130,23 +166,23 @@ matrix:
130166
addons:
131167
apt:
132168
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
133-
packages: ['g++-6', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
169+
packages: ['g++-6', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
134170
env: COMPILER='g++-6' BUILD_TYPE='Release'
135171

136172
- os: linux
137173
compiler: linux-gcc6-dev
138174
addons:
139175
apt:
140176
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
141-
packages: ['g++-6', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
177+
packages: ['g++-6', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
142178
env: COMPILER='g++-6' BUILD_TYPE='Dev'
143179

144180
- os: linux
145181
compiler: linux-gcc6-coverage
146182
addons:
147183
apt:
148184
sources: ['ubuntu-toolchain-r-test', 'boost-latest']
149-
packages: ['g++-6', 'libboost1.55-all-dev', 'libgdal-dev', 'libgeos++-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
185+
packages: ['g++-6', 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin']
150186
env: COMPILER='g++-6' BUILD_TYPE='Coverage'
151187

152188

0 commit comments

Comments
 (0)