| 1 |
From be338ef32da74bc54a1de00a023f1acfe2344198 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Erik Faye-Lund <kusmabite@gmail.com> |
| 3 |
Date: Wed, 2 Mar 2022 12:58:58 +0100 |
| 4 |
Subject: [PATCH 15/29] Revert "ci: downgrade sphinx to v3.x" |
| 5 |
|
| 6 |
The readthedocs theme now supports Sphinx 4.x, so there's no longer any |
| 7 |
reason to stick with 3.x. |
| 8 |
|
| 9 |
This reverts commit a545b6eda040ee40b5c36533d7ae378fc24fcf09. |
| 10 |
|
| 11 |
Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com> |
| 12 |
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15212> |
| 13 |
(cherry picked from commit dd9b8881e0ad84ab1e74d972a8233f5c03e7b37a) |
| 14 |
--- |
| 15 |
.gitlab-ci.yml | 2 +- |
| 16 |
.pick_status.json | 2 +- |
| 17 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml |
| 20 |
index b59c4b85ba6..aabab30a821 100644 |
| 21 |
--- a/.gitlab-ci.yml |
| 22 |
+++ b/.gitlab-ci.yml |
| 23 |
@@ -102,7 +102,7 @@ stages: |
| 24 |
- .ci-run-policy |
| 25 |
script: |
| 26 |
- apk --no-cache add graphviz doxygen |
| 27 |
- - pip3 install "sphinx<4.0" breathe mako sphinx_rtd_theme |
| 28 |
+ - pip3 install sphinx breathe mako sphinx_rtd_theme |
| 29 |
- docs/doxygen-wrapper.py --out-dir=docs/doxygen_xml |
| 30 |
- sphinx-build -W -b html docs public |
| 31 |
|
| 32 |
diff --git a/.pick_status.json b/.pick_status.json |
| 33 |
index 8c1d1203bbf..74b8ea8603c 100644 |
| 34 |
--- a/.pick_status.json |
| 35 |
+++ b/.pick_status.json |
| 36 |
@@ -2092,7 +2092,7 @@ |
| 37 |
"description": "Revert \"ci: downgrade sphinx to v3.x\"", |
| 38 |
"nominated": true, |
| 39 |
"nomination_type": 2, |
| 40 |
- "resolution": 0, |
| 41 |
+ "resolution": 1, |
| 42 |
"main_sha": null, |
| 43 |
"because_sha": "a545b6eda040ee40b5c36533d7ae378fc24fcf09" |
| 44 |
}, |
| 45 |
-- |
| 46 |
2.30.2 |
| 47 |
|
Parent Directory
| 
Revision Log