diff options
| author | Greg Hudson <ghudson@mit.edu> | 2021-05-26 15:08:28 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2021-07-12 11:58:54 -0400 |
| commit | d72bb019d2381b93d60b2f40836cfb23873abfdb (patch) | |
| tree | 5b57c41969d5c5868f4a265b2c8c51116a908796 /.github | |
| parent | 22c55d3a9b2f79e2b28a9632d7b517817903059b (diff) | |
| download | krb5-d72bb019d2381b93d60b2f40836cfb23873abfdb.zip krb5-d72bb019d2381b93d60b2f40836cfb23873abfdb.tar.gz krb5-d72bb019d2381b93d60b2f40836cfb23873abfdb.tar.bz2 | |
Fix doc build for Sphinx 4.0
Use app.add_css_file() to register krb5.css if possible (it was added
in Sphinx 1.8), since the old name app.add_stylesheet() was removed in
Sphinx 4.0.
Use the highlight directive instead of the highlightlang directive,
which was removed in Sphinx 4.0.
Remove two duplicate table of contents entries to fix warnings.
In the Github Actions configuration, add a second doc build using the
newest version of Sphinx.
(cherry picked from commit 3fa40a32e22cb9de91fa1d18deddcba446515855)
ticket: 9006
version_fixed: 1.19.2
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/doc.yml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 292df4c..75f467c 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -5,7 +5,7 @@ on: pull_request: {paths: [doc/**, src/doc/*, src/include/krb5/krb5.hin, .github/workflows/doc.yml]} jobs: - doc: + doc-older-sphinx: runs-on: ubuntu-18.04 steps: - name: Checkout repository @@ -19,6 +19,20 @@ jobs: run: | cd src/doc make -f Makefile.in SPHINX_ARGS=-W htmlsrc + doc-newest-sphinx: + runs-on: ubuntu-18.04 + steps: + - name: Checkout repository + uses: actions/checkout@v1 + - name: Linux setup + run: | + sudo apt-get update -qq + sudo apt-get install -y doxygen python3-lxml python3-pip + pip3 install Cheetah3 sphinx + - name: Build documentation + run: | + cd src/doc + make -f Makefile.in SPHINX_ARGS=-W htmlsrc - name: Upload HTML uses: actions/upload-artifact@v2 with: |