Run tests on apache-parser-v2 (#7231)

We're planning on using the branch apache-parser-v2 allowing us to incrementally work on the new Apache parser and feel comfortable landing temporary test code that we don't really want in master.

The apache-parser-v2 branch is created and locked down, but neither Travis or AppVeyor are configured to run tests on it. See #7230. This PR fixes that problem.

This could probably just land in the apache-parser-v2 branch, but why unnecessarily deviate the branch from master? It doesn't hurt anything there. Once it lands, I'll get this added to the apache-parser-v2 branch too.

* Run tests on apache-parser-v2.

* add comment

* Don't run full test suite on apache-parser-v2.
This commit is contained in:
Brad Warren
2019-07-10 16:30:06 -07:00
committed by GitHub
parent 74292a10f5
commit add24d4861
2 changed files with 9 additions and 2 deletions
+6 -2
View File
@@ -16,6 +16,9 @@ before_script:
# is a cap of on the number of simultaneous runs. # is a cap of on the number of simultaneous runs.
branches: branches:
only: only:
# apache-parser-v2 is a temporary branch for doing work related to
# rewriting the parser in the Apache plugin.
- apache-parser-v2
- master - master
- /^\d+\.\d+\.x$/ - /^\d+\.\d+\.x$/
- /^test-.*$/ - /^test-.*$/
@@ -24,9 +27,10 @@ branches:
not-on-master: &not-on-master not-on-master: &not-on-master
if: NOT (type = push AND branch = 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 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: matrix:
include: include:
+3
View File
@@ -7,6 +7,9 @@ environment:
branches: branches:
only: only:
# apache-parser-v2 is a temporary branch for doing work related to
# rewriting the parser in the Apache plugin.
- apache-parser-v2
- master - master
- /^\d+\.\d+\.x$/ # Version branches like X.X.X - /^\d+\.\d+\.x$/ # Version branches like X.X.X
- /^test-.*$/ - /^test-.*$/