svn commit: r1892846 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml test/test_travis_conditions.sh

[jo...@apache.org]

Author: jorton
Date: Fri Sep  3 08:33:22 2021
New Revision: 1892846

URL: http://svn.apache.org/viewvc?rev=1892846&view=rev
Log:
Merge r1892841, r1892845 from trunk:

Adjust Travis conditions for candidate-2.4.x tags.

Second attempt at updating the Travis conditions to work properly
for candidate-2.4.x branches, and add a mini test script for the
conditions.


Added:
    httpd/httpd/branches/2.4.x/test/test_travis_conditions.sh
      - copied unchanged from r1892845, httpd/httpd/trunk/test/test_travis_conditions.sh
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:r1892841,1892845

Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1892846&r1=1892845&r2=1892846&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Fri Sep  3 08:33:22 2021
@@ -37,8 +37,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 branch ~= /^candidate-2.4/)) OR (tag is present AND tag ~= /^2.4/)
+_cond2: &condition_not_24x (branch is not present OR (branch != 2.4.x AND branch !~ /^candidate-2.4/)) AND (tag is not present OR tag !~ /^2.4/)
 
 jobs:
   include: