From: Joe Orton <jorton@apache.org>
Date: Wed, 29 Jul 2020 14:01:33 +0000 (+0000)
Subject: Update some conditions. [skip ci]
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e20e009a599131a78ece2883016947620dfb1b1;p=thirdparty%2Fapache%2Fhttpd.git

Update some conditions. [skip ci]


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

diff --git a/.travis.yml b/.travis.yml
index 80348b91910..9f068e2ce6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,8 @@ jobs:
   include:
     - name: Linux Ubuntu, Default module set
     # -------------------------------------------------------------------------
-    - name: Empty APLOGNO() test
+    - if: *condition_not_24x
+      name: Empty APLOGNO() test
       env: SKIP_TESTING=1 TEST_LOGNO=1
     # -------------------------------------------------------------------------
     - name: Linux s390x Ubuntu, all-modules
@@ -58,7 +59,7 @@ jobs:
       arch: arm64
       env: CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
-    - if: branch = trunk
+    - if: *condition_not_24x
       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"