From: Joe Orton <jorton@apache.org>
Date: Fri, 20 Mar 2020 12:15:59 +0000 (+0000)
Subject: Merge r1875471, r1875472 from trunk:
X-Git-Tag: 2.4.43~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=462a0bc7c86e652a4c6d5ed3921b24dcfb27995b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1875471, r1875472 from trunk:

Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.

Fix the travis syntax (should have done it in a PR...).



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

diff --git a/.travis.yml b/.travis.yml
index cabc03676b6..a4543eb92a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,8 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall"
            TEST_ARGS="-v"
     # -------------------------------------------------------------------------
-    - name: Linux i386 Ubuntu, Shared MPMs, most modules, maintainer-mode w/-Werror
+    - if: branch = trunk
+      name: Linux i386 Ubuntu, Shared MPMs, most modules, maintainer-mode w/-Werror
       env: CONFIG="--enable-mods-shared=reallyall --disable-xml2enc --disable-proxy-html --enable-mpms-shared=all --enable-maintainer-mode"
            PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
            NOTEST_CFLAGS="-Werror"
@@ -97,7 +98,7 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
-    - if: branch = master
+    - if: branch = trunk
       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,14 +144,14 @@ jobs:
             - libpcre2-dev
     # -------------------------------------------------------------------------
     # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942
-    - if: branch = master
+    - if: branch = trunk
       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 = master
+    - if: branch = trunk
       name: Linux Ubuntu, APR trunk
       env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
            CONFIG="--enable-mods-shared=reallyall"
@@ -217,7 +218,7 @@ jobs:
       env: APR_VERSION=1.4.8 APU_VERSION=1.4.2
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
-    - if: branch = master
+    - if: branch = trunk
       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