travis: upgrade to Xenial
Travis now supports Ubuntu 16.04 (Xenial): https://blog.travis-ci.com/2018-11-08-xenial-release Simplify the environment: - Clang 7 is default, https://docs.travis-ci.com/user/languages/c/ (ubuntu-toolchain-r-test is still needed because GCC 5.4 is default) - libnghttp2-dev, libssh-gcrypt-dev and libmaxminddb-dev are available. (No longer requires ppa:wireshark-dev/stable) Upgrading to Xenial will also enable Libgcrypt 1.6 tests and includes GnuTLS 3.4.10 which will be useful for future PKCS #11 tests. Gitlab's rpm-centos-7 still covers Libgcrypt 1.5.3 and GnuTLS 3.3.29. Coverage will be lost for GnuTLS 3.2.11 (Ubuntu 14.04, Trusty). Change-Id: Ic28bf23707c75b2c97bedad66206e9c1f129164c Reviewed-on: https://code.wireshark.org/review/31039 Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
18c737c2a6
commit
a33d4ccb06
32
.travis.yml
32
.travis.yml
|
@ -1,6 +1,6 @@
|
|||
language: minimal
|
||||
sudo: required
|
||||
dist: trusty
|
||||
dist: xenial
|
||||
matrix:
|
||||
include:
|
||||
- name: OSX (clang-9) with PCAP
|
||||
|
@ -26,7 +26,6 @@ matrix:
|
|||
update: true
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- sourceline: 'ppa:wireshark-dev/stable'
|
||||
packages: g++-8
|
||||
env:
|
||||
- CXX=g++-8
|
||||
|
@ -39,39 +38,22 @@ matrix:
|
|||
update: true
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- sourceline: 'ppa:wireshark-dev/stable'
|
||||
packages: g++-8
|
||||
env:
|
||||
- CXX=g++-8
|
||||
- CC=gcc-8
|
||||
- PCAP=OFF
|
||||
- name: Linux (clang-7) with PCAP
|
||||
- name: Linux (clang) with PCAP
|
||||
os: linux
|
||||
addons:
|
||||
apt:
|
||||
update: true
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-7
|
||||
- sourceline: 'ppa:wireshark-dev/stable'
|
||||
packages: clang-7
|
||||
env:
|
||||
- CXX=clang++-7
|
||||
- CC=clang-7
|
||||
- CXX=clang++
|
||||
- CC=clang
|
||||
- PCAP=ON
|
||||
- name: Linux (clang-7) without PCAP
|
||||
- name: Linux (clang) without PCAP
|
||||
os: linux
|
||||
addons:
|
||||
apt:
|
||||
update: true
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-7
|
||||
- sourceline: 'ppa:wireshark-dev/stable'
|
||||
packages: clang-7
|
||||
env:
|
||||
- CXX=clang++-7
|
||||
- CC=clang-7
|
||||
- CXX=clang++
|
||||
- CC=clang
|
||||
- PCAP=OFF
|
||||
before_install:
|
||||
- echo $TRAVIS_OS_NAME
|
||||
|
|
Loading…
Reference in New Issue