[Git][ghc/ghc][wip/ci-docs] 3 commits: testing

[Matthew Pickering (@mpickering)]

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


Commits:
a2e9e6bc by Matthew Pickering at 2024-02-28T15:20:43+00:00
testing

- - - - -
60d9c0a1 by Matthew Pickering at 2024-02-28T15:24:13+00:00
fix

- - - - -
e1152603 by Matthew Pickering at 2024-02-28T15:25:18+00:00
fixes

- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -140,9 +140,6 @@ function mingw_init() {
       fail "win32-init: Unknown MSYSTEM $MSYSTEM"
       ;;
   esac
-  which python
-  which pip
-
   # Bring mingw toolchain into PATH.
   # This is extracted from /etc/profile since this script inexplicably fails to
   # run under gitlab-runner.
@@ -152,10 +149,7 @@ function mingw_init() {
   PATH="$MINGW_MOUNT_POINT/bin:$PATH"
 
   # We always use mingw64 Python to avoid path length issues like #17483.
-  ls /mingw64/bin/
-  /mingw64/bin/sphinx-build.exe --version
   export PYTHON="/mingw64/bin/python3"
-  export PIP="/mingw64/bin/pip"
 }
 
 # This will contain GHC's local native toolchain
@@ -196,7 +190,6 @@ function set_toolchain_paths() {
       HAPPY="$toolchain/bin/happy$exe"
       ALEX="$toolchain/bin/alex$exe"
       SPHINXBUILD="/mingw64/bin/sphinx-build.exe"
-      PYTHONPATH="$toolchain/sphinx"
       export PYTHONPATH
       if [ "$(uname)" = "FreeBSD" ]; then
         GHC=/usr/local/bin/ghc
@@ -347,49 +340,12 @@ function fetch_cabal() {
   fi
 }
 
-function fetch_sphinx() {
-  if [ ! -e "$SPHINXBUILD" ]; then
-      local v="$SPHINXBUILD_VERSION"
-      if [[ -z "$v" ]]; then
-          fail "neither SPHINXBUILD nor SPHINXBUILD__VERSION are not set"
-      fi
-
-      start_section "fetch sphinx"
-      info "Building sphinx $SPHINXBUILD_VERSION..."
-      case "$(uname)" in
-        # N.B.
-        MSYS_*|MINGW*)
-          /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
-          ls -alh $toolchain/sphinx/
-          cat $toolchain/sphinx/bin/sphinx-build.exe
-#          $PYTHON -m venv $toolchain/.venv-sphinx
-#          $toolchain/.venv-sphinx/bin/pip uninstall -y sphinx
-#          cat $toolchain/.venv-sphinx/bin/pip
-#          cat $toolchain/.venv-sphinx/bin/python
-#          info "Building sphinx2 $SPHINXBUILD_VERSION..."
-#          $toolchain/.venv-sphinx/bin/pip install -vvv --upgrade "sphinx==$SPHINXBUILD_VERSION"
-#          $toolchain/.venv-sphinx/bin/pip show -v sphinx
-#          info "Building sphinx3 $SPHINXBUILD_VERSION..."
-#          ls $toolchain/.venv-sphinx
-#          ls $toolchain/.venv-sphinx/lib
-#          ls $toolchain/.venv-sphinx/bin
-          ;;
-      esac
-      end_section "fetch sphinx"
-  fi
-}
-
 # For non-Docker platforms we prepare the bootstrap toolchain
 # here. For Docker platforms this is done in the Docker image
 # build.
 function setup_toolchain() {
   fetch_ghc
   fetch_cabal
-  fetch_sphinx
   cabal_update
 
   local cabal_install="$CABAL v2-install \
@@ -543,7 +499,6 @@ function build_hadrian() {
   else
     case "$(uname)" in
         MSYS_*|MINGW*)
-          run_hadrian _build/manpage/ghc.1 -V
           run_hadrian test:all_deps reloc-binary-dist -V
           mv _build/reloc-bindist/ghc*.tar.xz "$BIN_DIST_NAME.tar.xz"
           ;;



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0c126060d4cfad94c91d0fee5e30b45e9a960245...e1152603568ecfc593916d89965f704e338f9b2e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0c126060d4cfad94c91d0fee5e30b45e9a960245...e1152603568ecfc593916d89965f704e338f9b2e
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/7ea30340/attachment-0001.html>