Mesa (master): docs: Move the current CI .rst doc to docs/ci/ and link to it from .gitlab-ci.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jul 8 20:45:08 UTC 2020


Module: Mesa
Branch: master
Commit: 9af82b50264698e90d8914e9499d6301f875483a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9af82b50264698e90d8914e9499d6301f875483a

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jul  6 20:53:31 2020 -0700

docs: Move the current CI .rst doc to docs/ci/ and link to it from .gitlab-ci.

I want the docs to be discoverable next to the code, and sphinx insists
that all docs are under the top-level docs dir (sigh).  We can't symlink
from that dir to .gitlab-ci because windows builds can't do symlinks, so
link back the other direction.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5510>

---

 .gitlab-ci/docs               | 1 +
 docs/{ci.rst => ci/index.rst} | 0
 docs/contents.rst             | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/docs b/.gitlab-ci/docs
new file mode 120000
index 00000000000..af422dba8f1
--- /dev/null
+++ b/.gitlab-ci/docs
@@ -0,0 +1 @@
+../docs/ci
\ No newline at end of file
diff --git a/docs/ci.rst b/docs/ci/index.rst
similarity index 100%
rename from docs/ci.rst
rename to docs/ci/index.rst
diff --git a/docs/contents.rst b/docs/contents.rst
index 4403bc0898d..f825ba8cbdc 100644
--- a/docs/contents.rst
+++ b/docs/contents.rst
@@ -61,7 +61,7 @@
    devinfo
    codingstyle
    submittingpatches
-   ci
+   ci/index
    releasing
    release-calendar
    sourcedocs



More information about the mesa-commit mailing list