From: Peter Eisentraut <peter@eisentraut.org>
Date: Wed, 28 Aug 2019 19:04:09 +0000 (+0200)
Subject: Travis CI: Update to bionic instead of xenial
X-Git-Tag: pgbouncer_1_12_0~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19cdebd74a9ef763a3fc2c306cc67a74cca8e905;p=pgbouncer

Travis CI: Update to bionic instead of xenial

Enable OpenSSL for Valgrind run, since it should work now (see
66b6dc2c31f7360e11347b20216c6c7ec5ce13cf).

Disable ElectricFence, seems broken:
<https://answers.launchpad.net/ubuntu/+question/674132>

Enable -Werror for c-ares build.  Warning about broken IPv6 support
should be gone now.
---

diff --git a/.travis.yml b/.travis.yml
index 129f3d7..1b1a253 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 language: c
 addons:
   apt:
@@ -31,15 +31,13 @@ env:
     - configure_args='' PGVERSION=9.5
     - configure_args='--disable-evdns --without-cares --without-udns'
     - configure_args='--enable-evdns  --without-cares --without-udns'
-    - configure_args='--disable-evdns --with-cares    --without-udns --disable-werror'
+    - configure_args='--disable-evdns --with-cares    --without-udns'
     - configure_args='--disable-evdns --without-cares --with-udns'
     - configure_args='--with-pam'
     - configure_args='--with-openssl'
     - configure_args='--without-openssl'
-    - use_efence=yes   configure_args='--with-openssl --with-pam'
-    - use_efence=yes   PGVERSION=9.5 configure_args='--with-openssl --with-pam'
-    - use_valgrind=yes configure_args='--without-openssl'
-    - use_valgrind=yes PGVERSION=9.5 configure_args='--without-openssl'
+    - use_valgrind=yes
+    - use_valgrind=yes PGVERSION=9.5
 script: |
   set -e
   PATH=/usr/lib/postgresql/${PGVERSION}/bin:$PATH