[Git][ghc/ghc][wip/ci-docs] testing

[Matthew Pickering (@mpickering)]

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


Commits:
4b79d5da by Matthew Pickering at 2024-02-28T14:55:53+00:00
testing

- - - - -


2 changed files:

- .gitlab/ci.sh
- configure.ac


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -195,7 +195,7 @@ function set_toolchain_paths() {
       CABAL="$toolchain/bin/cabal$exe"
       HAPPY="$toolchain/bin/happy$exe"
       ALEX="$toolchain/bin/alex$exe"
-      SPHINXBUILD="$toolchain/sphinx/bin/sphinx-build$exe"
+      SPHINXBUILD="/mingw64/bin/sphinx-build.exe"
       PYTHONPATH="$toolchain/sphinx"
       export PYTHONPATH
       if [ "$(uname)" = "FreeBSD" ]; then
@@ -359,8 +359,8 @@ function fetch_sphinx() {
       case "$(uname)" in
         # N.B.
         MSYS_*|MINGW*)
-          pip uninstall -y sphinx
-          pip install -v --target=$toolchain/sphinx --upgrade "sphinx==$SPHINXBUILD_VERSION"
+          /usr/bin/pip uninstall -y sphinx
+          /usr/bin/pip install -v --target=$toolchain/sphinx --upgrade "sphinx==$SPHINXBUILD_VERSION"
           cp -p $toolchain/sphinx/bin/sphinx-build $toolchain/sphinx/bin/sphinx-build.exe
           chmod +x $toolchain/sphinx/bin/sphinx-build.exe
           ls -alh $toolchain/sphinx/bin


=====================================
configure.ac
=====================================
@@ -784,6 +784,8 @@ changequote(, )dnl
 fi;
 changequote([, ])dnl
 ])
+"$SPHINXBUILD" --version
+
 FP_COMPARE_VERSIONS([$fp_cv_sphinx_version],-lt,1.0.0,
     [AC_MSG_WARN([Sphinx version 1.0.0 or later is required to build documentation]); SPHINXBUILD=;])
 if test -n "$SPHINXBUILD"; then



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4b79d5dac86fed22455f5b277c87b2ec008df2b8

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4b79d5dac86fed22455f5b277c87b2ec008df2b8
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/20240228/f9491fc2/attachment-0001.html>