Merge remote-tracking branch 'origin/topic/timw/docs-action-only-for-master'

* origin/topic/timw/docs-action-only-for-master:
  generate-docs: Only update submodule pointer during scheduled builds

.github/workflows/generate-docs.yml

@@ -34,7 +34,13 @@ jobs:
         with:
           submodules: "recursive"
 
+      # Only reset the submodule pointer for scheduled builds. The reason to do
+      # this is to pick up any merge commits or anything that may have been
+      # missed in a merge, but not have any actual content. We don't want to do
+      # it otherwise because PRs should just use the submodule they're pointing
+      # at.
       - name: Switch doc submodule to master
+        if: github.event_name == 'schedule'
         run: cd doc && git checkout master
 
       - name: Fetch Dependencies

CHANGES

@@ -1,3 +1,7 @@
+6.0.0-dev.508 | 2023-05-05 08:48:10 -0700
+
+  * generate-docs: Only update submodule pointer during scheduled builds (Tim Wojtulewicz, Corelight)
+
 6.0.0-dev.505 | 2023-05-04 20:08:33 +0200
 
   * GH-2998: NTP: Detect out-of-order packets (Arne Welzel, Corelight)

VERSION

@@ -1 +1 @@
-6.0.0-dev.505
+6.0.0-dev.508