diff options
| author | Joe Orton <jorton@apache.org> | 2022-01-12 14:49:10 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2022-01-12 14:49:10 +0000 |
| commit | 6fbe626bd01f95d29af9ce8d111e59e6e8274d20 (patch) | |
| tree | ec6d96bfd0e12e44f15bba0af27471832e34bab0 | |
| parent | 1363824e06d492f66560c4b7c73f8d3b0af1c2bf (diff) | |
| download | apr-6fbe626bd01f95d29af9ce8d111e59e6e8274d20.tar.gz | |
Merge r1896722, r1896782 from trunk:
Add GCC 10 build to Travis config.
Since bionic is the default, switch one -Werror build to xenial.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1896966 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2ac489f0e..95f3623dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,12 +23,22 @@ matrix: env: CONFIG="--enable-maintainer-mode --disable-ipv6" - name: Maintainer-mode, -Werror env: NOTEST_CFLAGS=-Werror CONFIG="--enable-maintainer-mode" - - name: Maintainer-mode, -Werror (Bionic) - dist: bionic + - name: Maintainer-mode, -Werror (Xenial) + dist: xenial env: NOTEST_CFLAGS=-Werror CONFIG="--enable-maintainer-mode" - name: Maintainer-mode, -Werror (Focal) dist: focal env: NOTEST_CFLAGS=-Werror CONFIG="--enable-maintainer-mode" + - name: GCC 10, maintainer-mode, -Werror (Focal) + dist: focal + env: NOTEST_CFLAGS="-Werror -O2" CONFIG="--enable-maintainer-mode" CC=gcc-10 + addons: + apt: + sources: + - sourceline: 'ppa:ubuntu-toolchain-r/test' + packages: + - libtool-bin + - gcc-10 before_script: sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6' |