Merge remote-tracking branch 'origin/topic/timw/include-zeekjs-in-docs-by-default'

* origin/topic/timw/include-zeekjs-in-docs-by-default:
  Add libnode-dev to docs github runner, update docs to include ZeekJS

.github/workflows/generate-docs.yml

@@ -60,6 +60,7 @@ jobs:
             libfl-dev \
             libfl2 \
             libkrb5-dev \
+            libnode-dev \
             libpcap-dev \
             libssl-dev \
             make \
@@ -82,12 +83,24 @@ jobs:
           key: 'docs-gen-${{ github.job }}'
           max-size: '2000M'
 
+      # Github runners have node installed on them by default in /usr/local. This
+      # causes problems with configure finding the version from the apt package,
+      # plus gcc using it by default if we pass the right cmake variables to
+      # configure. The easiest solution is to move the directory away prior to
+      # running our build. It's moved back after just in case some workflow action
+      # expects it to exist.
+      - name: Move default node install to backup
+        run: sudo mv /usr/local/include/node /usr/local/include/node.bak
+
       - name: Configure
         run: ./configure --disable-broker-tests --disable-cpp-tests --ccache
 
       - name: Build
         run: cd build && make -j $(nproc)
 
+      - name: Move default node install to original location
+        run: sudo mv /usr/local/include/node.bak /usr/local/include/node
+
       - name: Check Spicy docs
         run: cd doc && make check-spicy-docs
 

CHANGES

@@ -1,3 +1,7 @@
+7.2.0-dev.556 | 2025-04-17 08:59:11 -0700
+
+  * Add libnode-dev to docs github runner, update docs to include ZeekJS (Tim Wojtulewicz, Corelight)
+
 7.2.0-dev.554 | 2025-04-17 16:56:34 +0200
 
   * pre-commit: Ensure testing files have @TEST lines commented (Arne Welzel, Corelight)

VERSION

@@ -1 +1 @@
-7.2.0-dev.554
+7.2.0-dev.556

doc

@@ -1 +1 @@
-Subproject commit e6d259b4b737db33d8a85e49b125c2c45ca922da
+Subproject commit cc5e123b2f1c406694879cd969f828a3048cf6d8