mirror of
https://github.com/apache/httpd.git
synced 2025-07-21 23:44:07 +00:00
Update Travis conditions to drop /candidate-2.4/ matching now release
scripts are updated to use "2.4.N..candidate" naming. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1898728 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@ -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:
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user