]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix the condition_not_24x condition since it's now clear how 2.4 tagged builds look...
authorJoe Orton <jorton@apache.org>
Wed, 29 Jul 2020 13:08:51 +0000 (13:08 +0000)
committerJoe Orton <jorton@apache.org>
Wed, 29 Jul 2020 13:08:51 +0000 (13:08 +0000)
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/trunk@1880399 13f79535-47bb-0310-9956-ffa450edef68

.travis.yml

index 10e0465b4b5baeecaa73ef36b8cc7d8bc03f5f5d..80348b9191075bb24f968df53fdcd6f135f90fdf 100644 (file)
@@ -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: