diff options
| author | Joe Orton <joe@manyfish.uk> | 2020-12-06 12:41:38 +0000 |
|---|---|---|
| committer | Joe Orton <joe@manyfish.uk> | 2020-12-06 12:41:38 +0000 |
| commit | fd09cc9b57c43c93acfeed5e861df0e078ea7d70 (patch) | |
| tree | 3ba4255e7ef79c702b85c26ccd16f53ebed4a2dd | |
| parent | bfbe0802736d9519b8d30a5cf198b1d12f685ddd (diff) | |
| download | neon-git-fd09cc9b57c43c93acfeed5e861df0e078ea7d70.tar.gz | |
Add focal builds, remove redundant compiler: lines.
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 46c1319..45a665e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,24 +16,18 @@ env: matrix: include: - name: Static - compiler: gcc env: CONF="--enable-static" - name: Shared - compiler: gcc env: CONF="--enable-shared" - name: Disable-all - compiler: gcc env: CONF="--without-libproxy --without-gssapi --without-zlib --disable-nls --disable-debug --disable-webdav" - name: Memleak - compiler: gcc env: CONF="--enable-memleak" - name: Libxml2 - compiler: gcc env: CONF="--with-libxml2" - name: Static UBSan w/OpenSSL env: CONF="--enable-static --with-ssl=openssl" CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" LIBS=-lubsan NEON_LIBS=-lubsan - name: Static 32-bit w/OpenSSL - compiler: gcc env: CONF="--enable-static --with-ssl=openssl" CC='gcc -m32' addons: apt: @@ -44,7 +38,6 @@ matrix: - libssl-dev:i386 - lib32z1-dev - name: OpenSSL - compiler: gcc env: CONF="--with-ssl=openssl" - name: OpenSSL on arm64 arch: arm64 @@ -60,11 +53,12 @@ matrix: env: CONF="--with-ssl=openssl --enable-shared --disable-static --enable-threadsafe-ssl=posix" CC="gcc -pthread" - name: OpenSSL on bionic - compiler: gcc dist: bionic env: CONF="--with-ssl=openssl" + - name: OpenSSL on focal + dist: focal + env: CONF="--with-ssl=openssl" - name: OpenSSL memleak - compiler: gcc env: CONF="--with-ssl=openssl --enable-memleak" - name: GnuTLS env: CONF="--with-ssl=gnutls" @@ -74,10 +68,12 @@ matrix: - name: GnuTLS on trusty dist: trusty env: CONF="--with-ssl=gnutls" + - name: GnuTLS on focal + dist: focal + env: CONF="--with-ssl=gnutls" - name: GnuTLS memleak env: CONF="--with-ssl=gnutls --enable-memleak" - name: Copyright check - compiler: gcc env: CONF="--without-libproxy --without-gssapi --without-zlib --disable-nls --disable-debug --disable-webdav" MARGS="update-copyright" allow_failures: # s390x builds currently flaky |