From: Joe Orton Date: Tue, 8 Mar 2022 08:46:04 +0000 (+0000) Subject: Update Travis conditions to drop /candidate-2.4/ matching now release X-Git-Tag: 2.5.0-alpha2-ci-test-only~452 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=024982eec4c565ad4c003a35bac84513a857bfb3;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/.travis.yml b/.travis.yml index 01bed9c783f..d512c86fb3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/test/test_travis_conditions.sh b/test/test_travis_conditions.sh index 82794eb76d5..74ea32ba012 100755 --- a/test/test_travis_conditions.sh +++ b/test/test_travis_conditions.sh @@ -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