From: Joe Orton <jorton@apache.org>
Date: Wed, 6 Nov 2019 09:28:54 +0000 (+0000)
Subject: Pull in more -dev packages to get more modules building (including mod_md).
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1825
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42ad8566a69cf42032f94156803eeee5cfe61c63;p=thirdparty%2Fapache%2Fhttpd.git

Pull in more -dev packages to get more modules building (including mod_md).
Test gcc 7 on bionic, xenial is the Travis default anyway.
Only add the toolchain PPA where really needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869441 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index 13cb37e573d..66ec54bc72d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,19 +6,17 @@ cache:
     - /home/travis/perl5
 addons:
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
-      - libtool
       - libtool-bin
       - libapr1-dev
       - libaprutil1-dev
       - perl-doc
       - lua5.3-dev
       - libbrotli-dev
+      - libcurl4-openssl-dev
+      - libsystemd-dev
       - libnghttp2-dev
-      - gcc-7
-      - gcc-8
+      - libjansson-dev
 
 matrix:
   include:
@@ -27,17 +25,34 @@ matrix:
       env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules"
     - name: Prefork MPM, all-modules
       env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --with-mpm=prefork"
-    - name: Xenial, all-modules
+    - name: Bionic, all-modules
       os: linux
-      dist: xenial
+      dist: bionic
       env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules"
     - name: GCC 7 maintainer-mode w/-Werror
+      os: linux
+      dist: bionic
       env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
            SKIP_TESTING=1
     - name: GCC 8 maintainer-mode w/-Werror
       env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-8"
            SKIP_TESTING=1
-
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-8
+            - libtool-bin
+            - libapr1-dev
+            - libaprutil1-dev
+            - perl-doc
+            - lua5.3-dev
+            - libbrotli-dev
+            - libcurl4-openssl-dev
+            - libsystemd-dev
+            - libnghttp2-dev
+            - libjansson-dev
 before_install:
   - cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
   - cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime