diff --git a/.azure-pipelines/main.yml b/.azure-pipelines/main.yml index d9609037e..eac3e451e 100644 --- a/.azure-pipelines/main.yml +++ b/.azure-pipelines/main.yml @@ -1,10 +1,6 @@ trigger: - # apache-parser-v2 is a temporary branch for doing work related to - # rewriting the parser in the Apache plugin. - - apache-parser-v2 - master pr: - - apache-parser-v2 - master - '*.x' diff --git a/.travis.yml b/.travis.yml index d3eeb1e03..f00071a6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,6 @@ branches: # When changing these branches, please ensure the documentation under # "Running tests in CI" is still correct. 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$/ - /^(travis-)?test-.*$/ @@ -32,9 +29,9 @@ 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 to -# non-development branches. See the explanation for apache-parser-v2 above. +# non-development branches. extended-test-suite: &extended-test-suite - if: type = cron OR (type = push AND branch NOT IN (apache-parser-v2, master)) + if: type = cron OR (type = push AND branch = master) matrix: include: