Merge r1880399 from trunk:

Fix the condition_not_24x condition since it's now clear how 2.4 tagged builds look like:

https://travis-ci.org/github/apache/httpd/jobs/712895950#L447

+: Travis tag = 2.4.44
+: Travis branch = 2.4.44

This should fix the false -ves which currently occur because
trunk-only tests are getting run for 2.4.x tags.

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

diff --git a/.travis.yml b/.travis.yml
index 7fb0490952cc794cf011121e91605a6ff2606d99..5ed40e189cd2bb109b44553872b95c7a2fa7846b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ env:
 #  condition_24x_only => run the job only for 2.4.x
 #  condition_not_24x  => run the job everywhere EXCEPT 2.4.x
 _cond1: &condition_24x_only (branch is present AND branch = 2.4.x) OR (tag is present AND tag ~= /^2.4/)
-_cond2: &condition_not_24x (branch is present AND branch != 2.4.x) OR (tag is present AND tag !~ /^2.4/)
+_cond2: &condition_not_24x (branch is not present OR branch != 2.4.x) AND (tag is not present OR tag !~ /^2.4/)
 
 jobs:
   include: