[Git][ghc/ghc][wip/ci-docs] sphinx?

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ci-docs at Glasgow Haskell Compiler / GHC


Commits:
1028ed00 by Matthew Pickering at 2024-02-27T11:24:01+00:00
sphinx?

- - - - -


3 changed files:

- .gitlab/ci.sh
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -192,6 +192,7 @@ function set_toolchain_paths() {
       CABAL="$toolchain/bin/cabal$exe"
       HAPPY="$toolchain/bin/happy$exe"
       ALEX="$toolchain/bin/alex$exe"
+      SPHINXBUILD="$toolchain/bin/sphinx-build$exe"
       if [ "$(uname)" = "FreeBSD" ]; then
         GHC=/usr/local/bin/ghc
       fi
@@ -223,6 +224,7 @@ function set_toolchain_paths() {
   export CABAL
   export HAPPY
   export ALEX
+  export SPHINXBUILD
 
   if [[ "${CROSS_TARGET:-}" == *"wasm"* ]]; then
     source "/home/ghc/.ghc-wasm/env"
@@ -264,6 +266,7 @@ function setup() {
   show_tool CABAL
   show_tool HAPPY
   show_tool ALEX
+  show_tool SPHINXBUILD
 
   info "====================================================="
   info "ghc --info"
@@ -339,20 +342,21 @@ function fetch_cabal() {
 }
 
 function fetch_sphinx() {
-  if [ ! -e "$CABAL" ]; then
-      local v="$CABAL_INSTALL_VERSION"
+  if [ ! -e "$SPHINXBUILD" ]; then
+      local v="$SPHINXBUILD_VERSION"
       if [[ -z "$v" ]]; then
-          fail "neither CABAL nor CABAL_INSTALL_VERSION are not set"
+          fail "neither SPHINXBUILD nor SPHINXBUILD__VERSION are not set"
       fi
 
       start_section "fetch sphinx"
       case "$(uname)" in
-        # N.B. Windows uses zip whereas all others use .tar.xz
+        # N.B.
         MSYS_*|MINGW*)
           $PYTHON -m venv $toolchain/.venv-sphinx
           source $toolchain/.venv-sphinx/activate
-          $PIP install -U sphinx
+          $PIP install -U "sphinx==$SPHINXBUILD_VERSION"
           deactivate
+          ls $toolchain/.venv-sphinx
           ;;
       esac
       end_section "fetch sphinx"


=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -426,9 +426,9 @@ opsysVariables Amd64 (Darwin {}) =
           ]
 opsysVariables _ (Windows {}) =
   mconcat [ "MSYSTEM" =: "CLANG64"
-          , "HADRIAN_ARGS" =: "--docs=no-sphinx"
           , "LANG" =: "en_US.UTF-8"
           , "CABAL_INSTALL_VERSION" =: "3.10.2.0"
+          , "SPHINXBUILD_VERSION" =: "7.2.6"
           , "GHC_VERSION" =: "9.6.4" ]
 opsysVariables _ _ = mempty
 


=====================================
.gitlab/jobs.yaml
=====================================
@@ -2489,10 +2489,10 @@
       "CABAL_INSTALL_VERSION": "3.10.2.0",
       "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
       "GHC_VERSION": "9.6.4",
-      "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "CLANG64",
       "RUNTEST_ARGS": "",
+      "SPHINXBUILD_VERSION": "7.2.6",
       "TEST_ENV": "x86_64-windows-int_native-validate",
       "XZ_OPT": "-9"
     }
@@ -2546,10 +2546,10 @@
       "CABAL_INSTALL_VERSION": "3.10.2.0",
       "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
       "GHC_VERSION": "9.6.4",
-      "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "CLANG64",
       "RUNTEST_ARGS": "",
+      "SPHINXBUILD_VERSION": "7.2.6",
       "TEST_ENV": "x86_64-windows-validate",
       "XZ_OPT": "-9"
     }
@@ -3986,11 +3986,12 @@
       "CABAL_INSTALL_VERSION": "3.10.2.0",
       "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
       "GHC_VERSION": "9.6.4",
-      "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx",
+      "HADRIAN_ARGS": "--hash-unit-ids",
       "IGNORE_PERF_FAILURES": "all",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "CLANG64",
       "RUNTEST_ARGS": "",
+      "SPHINXBUILD_VERSION": "7.2.6",
       "TEST_ENV": "x86_64-windows-int_native-release",
       "XZ_OPT": "-9"
     }
@@ -4044,11 +4045,12 @@
       "CABAL_INSTALL_VERSION": "3.10.2.0",
       "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
       "GHC_VERSION": "9.6.4",
-      "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx",
+      "HADRIAN_ARGS": "--hash-unit-ids",
       "IGNORE_PERF_FAILURES": "all",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "CLANG64",
       "RUNTEST_ARGS": "",
+      "SPHINXBUILD_VERSION": "7.2.6",
       "TEST_ENV": "x86_64-windows-release",
       "XZ_OPT": "-9"
     }
@@ -5141,10 +5143,10 @@
       "CABAL_INSTALL_VERSION": "3.10.2.0",
       "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
       "GHC_VERSION": "9.6.4",
-      "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "CLANG64",
       "RUNTEST_ARGS": "",
+      "SPHINXBUILD_VERSION": "7.2.6",
       "TEST_ENV": "x86_64-windows-validate"
     }
   }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1028ed002b93bd80f2be78661e2411081d92d317

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1028ed002b93bd80f2be78661e2411081d92d317
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240227/2a07a999/attachment-0001.html>