Adjust Travis conditions for candidate-2.4.x tags.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1892841 13f79535-47bb-0310-9956-ffa450edef68

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