diff --git a/CHANGES b/CHANGES index dba39d1730..c75e5db7ca 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.1.0-dev.398 | 2020-01-23 18:08:43 -0800 + + * Skip check for outdated docs in Cirrus CI for PRs (Jon Siwek, Corelight) + 3.1.0-dev.397 | 2020-01-23 15:30:33 -0800 * Use consistent zeek_init priority for Log::create_stream calls diff --git a/VERSION b/VERSION index 28bd5611e8..d4ab5411c1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.397 +3.1.0-dev.398 diff --git a/testing/btest/coverage/sphinx-zeekygen-docs.sh b/testing/btest/coverage/sphinx-zeekygen-docs.sh index b5e3d7262c..20e18c2364 100644 --- a/testing/btest/coverage/sphinx-zeekygen-docs.sh +++ b/testing/btest/coverage/sphinx-zeekygen-docs.sh @@ -8,10 +8,15 @@ # @TEST-EXEC: bash $SCRIPTS/update-zeekygen-docs.sh ./doc # @TEST-EXEC: bash %INPUT +# This test isn't run on Travis or Cirrus CI for pull-requests. Instead, +# the person merging to master will manually update zeek-docs. + +if [ -n "$CIRRUS_PR" ]; then + exit 0 +fi + if [ -n "$TRAVIS_PULL_REQUEST" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - # Don't run this test on Travis for pull-requests, just let someone - # manually update zeek-docs for things when merging to master. exit 0 fi fi