Skip to content

Commit fdc3d3d

Browse files
committed
zproject_travis.gsl : for shadow compilation with clang, must use specific travis dist
1 parent bd57edf commit fdc3d3d

File tree

1 file changed

+28
-4
lines changed

1 file changed

+28
-4
lines changed

zproject_travis.gsl

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,17 @@ matrix:
336336
os: linux
337337
. if (project.travis_dist ?<> "")
338338
dist: $(project.travis_dist)
339+
. else
340+
dist: xenial
339341
. endif
340342
addons:
341343
apt:
342344
sources:
343-
- llvm-toolchain-trusty-5.0
345+
. if (project.travis_dist ?<> "")
346+
- llvm-toolchain-$(project.travis_dist)-5.0
347+
. else
348+
- llvm-toolchain-xenial-5.0
349+
. endif
344350
. if (pkg_src_zeromq_dist ?<> "")
345351
- *$(pkg_src_zeromq_dist)
346352
. endif
@@ -351,11 +357,17 @@ matrix:
351357
os: linux
352358
. if (project.travis_dist ?<> "")
353359
dist: $(project.travis_dist)
360+
. else
361+
dist: xenial
354362
. endif
355363
addons:
356364
apt:
357365
sources:
358-
- llvm-toolchain-trusty-4.0
366+
. if (project.travis_dist ?<> "")
367+
- llvm-toolchain-$(project.travis_dist)-4.0
368+
. else
369+
- llvm-toolchain-xenial-4.0
370+
. endif
359371
. if (pkg_src_zeromq_dist ?<> "")
360372
- *$(pkg_src_zeromq_dist)
361373
. endif
@@ -366,11 +378,17 @@ matrix:
366378
os: linux
367379
. if (project.travis_dist ?<> "")
368380
dist: $(project.travis_dist)
381+
. else
382+
dist: xenial
369383
. endif
370384
addons:
371385
apt:
372386
sources:
373-
- llvm-toolchain-trusty-3.9
387+
. if (project.travis_dist ?<> "")
388+
- llvm-toolchain-$(project.travis_dist)-3.9
389+
. else
390+
- llvm-toolchain-xenial-3.9
391+
. endif
374392
. if (pkg_src_zeromq_dist ?<> "")
375393
- *$(pkg_src_zeromq_dist)
376394
. endif
@@ -381,11 +399,17 @@ matrix:
381399
os: linux
382400
. if (project.travis_dist ?<> "")
383401
dist: $(project.travis_dist)
402+
. else
403+
dist: xenial
384404
. endif
385405
addons:
386406
apt:
387407
sources:
388-
- llvm-toolchain-trusty-3.8
408+
. if (project.travis_dist ?<> "")
409+
- llvm-toolchain-$(project.travis_dist)-3.8
410+
. else
411+
- llvm-toolchain-xenial-3.8
412+
. endif
389413
. if (pkg_src_zeromq_dist ?<> "")
390414
- *$(pkg_src_zeromq_dist)
391415
. endif

0 commit comments

Comments
 (0)