[Git][ghc/ghc][wip/ci-bootstrap-jobs] ci: Unset ALEX/HAPPY variables when testing bootstrap jobs

[Matthew Pickering (@mpickering)]

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


Commits:
9f6f3f61 by Matthew Pickering at 2024-05-30T13:29:01+01:00
ci: Unset ALEX/HAPPY variables when testing bootstrap jobs

Ticket #24826 reports a regression in 9.10.1 when building from a source
distribution. This patch is an attempt to reproduce the issue on CI by
more aggressively removing `alex` and `happy` from the environment.

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab/ci.sh


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -708,7 +708,10 @@ test-bootstrap:
     - .gitlab/ci.sh setup
     # Bootstrapping should not depend on HAPPY or ALEX so set them to false
     # so the build fails if they are invoked.
-    - export HAPPY=/bin/false; export ALEX=/bin/false
+    - unset HAPPY; unset ALEX
+    # Check the commands are not available, parens are crucial to start a subshell
+    - (! command -v alex --version)
+    - (! command -v happy --version)
     - .gitlab/ci.sh configure
     - .gitlab/ci.sh build_hadrian
     - .gitlab/ci.sh test_hadrian


=====================================
.gitlab/ci.sh
=====================================
@@ -403,6 +403,12 @@ function configure() {
     else
     args+=("--disable-numa")
   fi
+  if [[ -n ${HAPPY:-} ]]; then
+    args+=("HAPPY=$HAPPY")
+  fi
+  if [[ -n ${ALEX:-} ]]; then
+    args+=("ALEX=$ALEX")
+  fi
 
   start_section "configuring"
   # See https://stackoverflow.com/questions/7577052 for a rationale for the
@@ -411,8 +417,6 @@ function configure() {
     --enable-tarballs-autodownload \
     "${args[@]+"${args[@]}"}" \
     GHC="$GHC" \
-    HAPPY="$HAPPY" \
-    ALEX="$ALEX" \
     || ( cat config.log; fail "configure failed" )
   end_section "configuring"
 }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9f6f3f61e158901a975779d88b6620723ed5fa87

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9f6f3f61e158901a975779d88b6620723ed5fa87
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/20240530/b4093de9/attachment-0001.html>