mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Merge remote-tracking branch 'origin/topic/bbannier/fix-docs-ci-again'
* origin/topic/bbannier/fix-docs-ci-again: Fix installation of Python packages in generate docs CI job again
This commit is contained in:
commit
c28442a9a1
3 changed files with 9 additions and 3 deletions
4
.github/workflows/generate-docs.yml
vendored
4
.github/workflows/generate-docs.yml
vendored
|
@ -17,7 +17,7 @@ jobs:
|
|||
permissions:
|
||||
contents: write # for Git to git push
|
||||
if: github.repository == 'zeek/zeek'
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
steps:
|
||||
# We only perform a push if the action was triggered via a schedule
|
||||
|
@ -71,7 +71,7 @@ jobs:
|
|||
# `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 -r doc/requirements.txt
|
||||
|
||||
- name: ccache
|
||||
uses: hendrikmuhs/ccache-action@v1.2
|
||||
|
|
6
CHANGES
6
CHANGES
|
@ -1,3 +1,9 @@
|
|||
7.1.0-dev.403 | 2024-10-18 09:55:20 -0700
|
||||
|
||||
* Fix installation of Python packages in generate docs CI job again (Benjamin Bannier, Corelight)
|
||||
|
||||
* Update doc submodule [nomail] [skip ci] (zeek-bot)
|
||||
|
||||
7.1.0-dev.400 | 2024-10-15 17:11:57 +0200
|
||||
|
||||
* Fix invalid Sphinx directive in docstring (Benjamin Bannier, Corelight)
|
||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
7.1.0-dev.400
|
||||
7.1.0-dev.403
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue