From: Joe Orton Date: Fri, 3 Sep 2021 07:54:03 +0000 (+0000) Subject: Adjust Travis conditions for candidate-2.4.x tags. X-Git-Tag: 2.5.0-alpha2-ci-test-only~844 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b4a341c0059bd1a21831ee06d1ad07cb17e74e3;p=thirdparty%2Fapache%2Fhttpd.git Adjust Travis conditions for candidate-2.4.x tags. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1892841 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/.travis.yml b/.travis.yml index aa814d0d91f..d32f285cf30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,8 @@ env: # definitions to either: # 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 not present OR branch != 2.4.x) AND (tag is not present OR tag !~ /^2.4/) +_cond1: &condition_24x_only (branch is present AND branch = 2.4.x) OR (tag is present AND (tag ~= /^2.4/ OR tag ~= /^candidate-2.4/)) +_cond2: &condition_not_24x (branch is not present OR branch != 2.4.x) AND (tag is not present OR (tag !~ /^2.4/ AND tag !~ /^candidate-2.4/)) jobs: include: