From: Joe Orton Date: Wed, 29 Jul 2020 13:08:51 +0000 (+0000) Subject: Fix the condition_not_24x condition since it's now clear how 2.4 tagged builds look... X-Git-Tag: 2.5.0-alpha2-ci-test-only~1251 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c1d173dd748dfcce3d922cc52ae917c1fa06165;p=thirdparty%2Fapache%2Fhttpd.git 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/trunk@1880399 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/.travis.yml b/.travis.yml index 10e0465b4b5..80348b91910 100644 --- 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: