From: Joe Orton <jorton@apache.org>
Date: Fri, 20 Mar 2020 11:24:16 +0000 (+0000)
Subject: Merge r1875467 from trunk:
X-Git-Tag: 2.4.43~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b64be8d9bfe8db435ada3a7ab4ea84b48330e7c;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1875467 from trunk:

Match Travis jobs for 2.4.x by tag as well as branch.
Ignore failures for s390x which is flaky in apt-get again.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1875468 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index 4b9ce8f51a4..8e3211c7929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,7 +97,7 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
-    - if: branch != 2.4.x
+    - if: branch != 2.4.x or tag !~ /^2.4/
       name: Linux Ubuntu, PCRE 1, GCC 7 maintainer-mode w/-Werror
       os: linux
       env: CONFIG="--enable-mods-shared=reallyall --with-pcre=/usr/bin/pcre-config --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
@@ -143,19 +143,19 @@ jobs:
             - libpcre2-dev
     # -------------------------------------------------------------------------
     # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942
-    - if: branch != 2.4.x
+    - if: branch != 2.4.x or tag !~ /^2.4/
       name: Linux Ubuntu, Regenerate ap_expr
       os: linux
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror"
            BUILDCONFIG="--with-regen-expr"
            MFLAGS=
     # -------------------------------------------------------------------------
-    - if: branch != 2.4.x
+    - if: branch != 2.4.x or tag !~ /^2.4/
       name: Linux Ubuntu, APR trunk
       env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
-    - if: branch = 2.4.x
+    - if: branch = 2.4.x or tag =~ /^2.4/
       name: Linux Ubuntu Xenial, all-modules, system APR/APR-util
       os: linux
       dist: xenial
@@ -207,21 +207,25 @@ jobs:
             - libpcre2-dev
             - litmus
     # -------------------------------------------------------------------------
-    - if: branch = 2.4.x
+    - if: branch = 2.4.x or tag =~ /^2.4/
       name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
       env: APR_VERSION=1.5.1 APU_VERSION=1.5.4
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
-    - if: branch = 2.4.x
+    - if: branch = 2.4.x or tag =~ /^2.4/
       name: Linux Ubuntu, APR 1.4.8, APR-util 1.4.2
       env: APR_VERSION=1.4.8 APU_VERSION=1.4.2
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
-    - if: branch != 2.4.x
+    - if: branch != 2.4.x or tag !~ /^2.4/
       name: Linux Ubuntu, UBSan
       env: NOTEST_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" NOTEST_LIBS=-lubsan
            CONFIG="--enable-mods-shared=reallyall --disable-http2" TEST_UBSAN=1
-
+  allow_failures:
+    # s390x is sometimes flaky
+    - arch: s390x
+      env: CONFIG="--enable-mods-shared=reallyall"
+           
 # 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
 # otherwise.