Merge remote-tracking branch 'origin/topic/jsiwek/skip-ci-benchmark'

* origin/topic/jsiwek/skip-ci-benchmark:
  Improve CI benchmark script's error handling/messaging

CHANGES

@@ -1,4 +1,8 @@
 
+3.3.0-dev.240 | 2020-09-02 20:51:13 -0700
+
+  * Improve CI benchmark script's error handling/messaging (Jon Siwek, Corelight)
+
 3.3.0-dev.238 | 2020-09-02 11:39:25 -0700
 
   * GH-955: Prohibit `fallthrough` in typecasting `switch` cases (Jon Siwek, Corelight)

VERSION

@@ -1 +1 @@
-3.3.0-dev.238
+3.3.0-dev.240

ci/benchmark.sh

@@ -12,6 +12,11 @@ if [ "${CIRRUS_USER_PERMISSION}" != "admin" -a "${CIRRUS_USER_PERMISSION}" != "w
     exit 0
 fi
 
+if [ "${CIRRUS_REPO_FULL_NAME}" != "zeek/zeek" ]; then
+    echo "Benchmarks skipped for non-zeek repo"
+    exit 0
+fi
+
 BUILD_URL="https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/${CIRRUS_TASK_NAME}/upload_binary/build.tgz"
 
 # Generate an md5 hash of the build file. We can do this here because the path to the

doc

@@ -1 +1 @@
-Subproject commit ca1acf17fc0a48b20e3d0eb0da81609b94f322ab
+Subproject commit 52ca9f0814aa33bd920a4b33d75dc48bb10f0728