Skip check for outdated docs in Cirrus CI for PRs

This commit is contained in:
Jon Siwek 2020-01-23 18:08:43 -08:00
parent 97bea7c4f1
commit f45c2cf06b
3 changed files with 12 additions and 3 deletions

View file

@ -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 3.1.0-dev.397 | 2020-01-23 15:30:33 -0800
* Use consistent zeek_init priority for Log::create_stream calls * Use consistent zeek_init priority for Log::create_stream calls

View file

@ -1 +1 @@
3.1.0-dev.397 3.1.0-dev.398

View file

@ -8,10 +8,15 @@
# @TEST-EXEC: bash $SCRIPTS/update-zeekygen-docs.sh ./doc # @TEST-EXEC: bash $SCRIPTS/update-zeekygen-docs.sh ./doc
# @TEST-EXEC: bash %INPUT # @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 [ -n "$TRAVIS_PULL_REQUEST" ]; then
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; 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 exit 0
fi fi
fi fi