From: Joe Orton Date: Wed, 29 Jul 2020 13:09:55 +0000 (+0000) Subject: Merge r1880399 from trunk: X-Git-Tag: 2.4.45~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e89d45586d420afcb8c0d2c4496c03a57fe06bd9;p=thirdparty%2Fapache%2Fhttpd.git 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 7fb0490952c..5ed40e189cd 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: