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/08 08:46:04 UTC
svn commit: r1898728 - in /httpd/httpd/trunk: .travis.yml test/test_travis_conditions.sh
Author: jorton
Date: Tue Mar 8 08:46:04 2022
New Revision: 1898728
URL: http://svn.apache.org/viewvc?rev=1898728&view=rev
Log:
Update Travis conditions to drop /candidate-2.4/ matching now release
scripts are updated to use "2.4.N..candidate" naming.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/test/test_travis_conditions.sh
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1898728&r1=1898727&r2=1898728&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Tue Mar 8 08:46:04 2022
@@ -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/ 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/)
+_cond1: &condition_24x_only (branch is present AND branch ~= /^2.4/) OR (tag is present AND tag ~= /^2.4/)
+_cond2: &condition_not_24x (branch is not present OR branch !~ /^2.4/) AND (tag is not present OR tag !~ /^2.4/)
jobs:
include:
Modified: httpd/httpd/trunk/test/test_travis_conditions.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/test_travis_conditions.sh?rev=1898728&r1=1898727&r2=1898728&view=diff
==============================================================================
--- httpd/httpd/trunk/test/test_travis_conditions.sh (original)
+++ httpd/httpd/trunk/test/test_travis_conditions.sh Tue Mar 8 08:46:04 2022
@@ -33,7 +33,6 @@ function testit()
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