diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2022-03-02 12:58:58 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2022-03-18 20:00:46 +0000 |
| commit | be338ef32da74bc54a1de00a023f1acfe2344198 (patch) | |
| tree | 12982f8be3a2b16b095fd4290e15206709f8795e | |
| parent | ce4b620e398aedac548418689077d25b434e6f33 (diff) | |
Revert "ci: downgrade sphinx to v3.x"
The readthedocs theme now supports Sphinx 4.x, so there's no longer any
reason to stick with 3.x.
This reverts commit a545b6eda040ee40b5c36533d7ae378fc24fcf09.
Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15212>
(cherry picked from commit dd9b8881e0ad84ab1e74d972a8233f5c03e7b37a)
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .pick_status.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b59c4b85ba6..aabab30a821 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,7 @@ stages: - .ci-run-policy script: - apk --no-cache add graphviz doxygen - - pip3 install "sphinx<4.0" breathe mako sphinx_rtd_theme + - pip3 install sphinx breathe mako sphinx_rtd_theme - docs/doxygen-wrapper.py --out-dir=docs/doxygen_xml - sphinx-build -W -b html docs public diff --git a/.pick_status.json b/.pick_status.json index 8c1d1203bbf..74b8ea8603c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2092,7 +2092,7 @@ "description": "Revert \"ci: downgrade sphinx to v3.x\"", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a545b6eda040ee40b5c36533d7ae378fc24fcf09" }, |