From ef055ddb7c05c45de6fb631855a4a83d440e9614 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 7 Aug 2025 21:38:36 -0700 Subject: [PATCH 1/2] Use virtualenv in docs generation/builds --- .github/workflows/generate-docs.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index af58b61e3f..cee9ed9970 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -66,16 +66,14 @@ jobs: make \ python3 \ python3-dev \ - python3-pip\ + python3-pip \ sqlite3 \ swig \ zlib1g-dev - # Many distros adhere to PEP 394's recommendation for `python` = - # `python2` so this is a simple workaround until we drop Python 2 - # support and explicitly use `python3` for all invocations. - sudo ln -sf /usr/bin/python3 /usr/local/bin/python - sudo pip3 install --break-system-packages -r doc/requirements.txt - sudo pip3 install --break-system-packages pre-commit + python3 -m venv ci-docs-venv + source ci-docs-venv/bin/activate + pip3 install -r doc/requirements.txt + pip3 install pre-commit - name: ccache uses: hendrikmuhs/ccache-action@v1.2 @@ -112,6 +110,7 @@ jobs: - name: Generate Docs run: | + source ci-docs-venv/bin/activate git config --global user.name zeek-bot git config --global user.email info@zeek.org From 302f6f2787a8bf61460e59c61db77bc4baa049e6 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 8 Aug 2025 20:38:43 -0700 Subject: [PATCH 2/2] Update docs submodule with new python packages --- doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc b/doc index 1ce37d96e2..6952b4b7c2 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 1ce37d96e268134100fbc6793c0c64d48e162337 +Subproject commit 6952b4b7c2d9032734d7e7972b147446d08e6d2e