You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2022/03/07 11:07:32 UTC
svn commit: r1898673 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml test/test_travis_conditions.sh
Author: jorton
Date: Mon Mar 7 11:07:32 2022
New Revision: 1898673
URL: http://svn.apache.org/viewvc?rev=1898673&view=rev
Log:
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]
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/.travis.yml
httpd/httpd/branches/2.4.x/test/test_travis_conditions.sh
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1898671
Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1898673&r1=1898672&r2=1898673&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Mon Mar 7 11:07:32 2022
@@ -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:
Modified: httpd/httpd/branches/2.4.x/test/test_travis_conditions.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/test_travis_conditions.sh?rev=1898673&r1=1898672&r2=1898673&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/test_travis_conditions.sh (original)
+++ httpd/httpd/branches/2.4.x/test/test_travis_conditions.sh Mon Mar 7 11:07:32 2022
@@ -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