svn commit: r1880400 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml

[jo...@apache.org]

Author: jorton
Date: Wed Jul 29 13:09:55 2020
New Revision: 1880400

URL: http://svn.apache.org/viewvc?rev=1880400&view=rev
Log:
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.


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/.travis.yml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1880399

Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1880400&r1=1880399&r2=1880400&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Wed Jul 29 13:09:55 2020
@@ -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: