From: Joe Orton <jorton@apache.org>
Date: Fri, 1 May 2020 08:17:16 +0000 (+0000)
Subject: Add gcc-10 job, drop gcc-9 config from allow_failures (seems stable again).
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce8e1b1e5e7742b14a2178316a9d22613709a04c;p=thirdparty%2Fapache%2Fhttpd.git

Add gcc-10 job, drop gcc-9 config from allow_failures (seems stable again).
Use -O2 for all gcc -Werror jobs otherwise warnings triggered under e.g.
aggressive inlining are not found.


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

diff --git a/.travis.yml b/.travis.yml
index 12b679e5b77..83f2659c9bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,7 +101,7 @@ jobs:
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, GCC 7 maintainer-mode w/-Werror
       os: linux
-      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
+      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-7
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
     - if: *condition_not_24x
@@ -110,7 +110,7 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall --with-pcre=/usr/bin/pcre-config --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, GCC 8 maintainer-mode w/-Werror
-      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-8"
+      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-8
            SKIP_TESTING=1
       addons:
         apt:
@@ -129,7 +129,7 @@ jobs:
             - libpcre2-dev
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, GCC 9 maintainer-mode w/-Werror
-      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-9"
+      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-9
            SKIP_TESTING=1
       addons:
         apt:
@@ -149,6 +149,27 @@ jobs:
             - libjansson-dev
             - libpcre2-dev
     # -------------------------------------------------------------------------
+    - name: Linux Ubuntu, GCC 10 maintainer-mode w/-Werror
+      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-10
+           SKIP_TESTING=1
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
+          packages:
+            - gcc-10
+            - libtool-bin
+            - libapr1-dev
+            - libaprutil1-dev
+            - perl-doc
+            - lua5.3-dev
+            - libbrotli-dev
+            - libcurl4-openssl-dev
+            - libsystemd-dev
+            - libnghttp2-dev
+            - libjansson-dev
+            - libpcre2-dev
+    # -------------------------------------------------------------------------
     # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942
     - if: *condition_not_24x
       name: Linux Ubuntu, Regenerate ap_expr
@@ -236,9 +257,6 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall"
     - arch: ppc64le
       env: CONFIG="--enable-mods-shared=reallyall"
-    # gcc 9 repo currently broken
-    - env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-9"
-           SKIP_TESTING=1
            
 # CPAN modules are to be used with the system Perl and always with
 # CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct