diff options
| author | Joe Orton <jorton@apache.org> | 2020-07-29 15:08:51 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-07-29 15:08:51 +0200 |
| commit | 5c1d173dd748dfcce3d922cc52ae917c1fa06165 (patch) | |
| tree | cd04b0b76382a70f2a9e957c6b5525f97808f35b | |
| parent | not my day, it seems (diff) | |
| download | apache2-5c1d173dd748dfcce3d922cc52ae917c1fa06165.tar.xz apache2-5c1d173dd748dfcce3d922cc52ae917c1fa06165.zip | |
Fix the condition_not_24x condition since it's now clear how 2.4 tagged builds look like:
https://travis-ci.org/github/apache/httpd/jobs/712895950#L447
+: Travis tag = 2.4.44
+: Travis branch = 2.4.44
This should fix the false -ves which currently occur because
trunk-only tests are getting run for 2.4.x tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1880399 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 10e0465b4b..80348b9191 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ env: # 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 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/) jobs: include: |