diff --git a/.travis.yml b/.travis.yml index 86a475ca8..baf385604 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,9 @@ before_script: # is a cap of on the number of simultaneous runs. branches: only: + # apache-parser-v2 is a temporary branch for doing work related to + # rewriting the parser in the Apache plugin. + - apache-parser-v2 - master - /^\d+\.\d+\.x$/ - /^test-.*$/ @@ -24,9 +27,10 @@ branches: not-on-master: ¬-on-master if: NOT (type = push AND branch = master) -# Jobs for the extended test suite are executed for cron jobs and pushes on non-master branches. +# Jobs for the extended test suite are executed for cron jobs and pushes to +# non-development branches. See the explanation for apache-parser-v2 above. extended-test-suite: &extended-test-suite - if: type = cron OR (type = push AND branch != master) + if: type = cron OR (type = push AND branch NOT IN (apache-parser-v2, master)) matrix: include: diff --git a/appveyor.yml b/appveyor.yml index 3d58847f8..33f522df1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,9 @@ environment: branches: only: + # apache-parser-v2 is a temporary branch for doing work related to + # rewriting the parser in the Apache plugin. + - apache-parser-v2 - master - /^\d+\.\d+\.x$/ # Version branches like X.X.X - /^test-.*$/