Merge r1898671 from trunk:

Adjust Travis branch-matching conditions to treat any
branch starting "2.4" like 2.4.x (in addition to
"candidate-2.4").

[under CTR for Travis exemption]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898673 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.travis.yml b/.travis.yml
index 708227b943c3f3c577a29acb2a181a17567923b3..ecb9b39319de20076c129a66a21018b66dae5e2c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -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 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/)
+_cond1: &condition_24x_only (branch is present AND (branch ~= /^2.4/ 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/ AND branch !~ /^candidate-2.4/)) AND (tag is not present OR tag !~ /^2.4/)
 
 jobs:
   include:

diff --git a/test/test_travis_conditions.sh b/test/test_travis_conditions.sh
index 32f663ae25d102d682a23f0955cdbc7a40d7931f..82794eb76d50cadd6766bc6bbbb2acc880c2e2cf 100755 (executable)
--- a/test/test_travis_conditions.sh
+++ b/test/test_travis_conditions.sh
@@ -34,6 +34,9 @@ testit '{"tag": "2.4.49"}' 2.4.x
 testit '{"tag": "2.5.59"}' trunk
 testit '{"branch": "2.4.x"}' 2.4.x
 testit '{"branch": "candidate-2.4.49"}' 2.4.x
+testit '{"branch": "2.4.55-candidate"}' 2.4.x
+testit '{"branch": "2.4-backport-branch"}' 2.4.x
+testit '{"branch": "2.4.x-something"}' 2.4.x
 testit '{"branch": "2.5.0"}' trunk
 testit '{"branch": "2.5.x"}' trunk
 testit '{"branch": "trunk"}' trunk