[Git][ghc/ghc][wip/test-primops] Revert "ci: Pass -Werror when building hadrian in hadrian-ghc-in-ghci job"

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/test-primops at Glasgow Haskell Compiler / GHC


Commits:
e44c3cb2 by Matthew Pickering at 2023-07-17T15:23:07+01:00
Revert "ci: Pass -Werror when building hadrian in hadrian-ghc-in-ghci job"

This reverts commit cbea9320ec9399daf9bb60d4e732dca408c05341.

- - - - -


6 changed files:

- .gitlab-ci.yml
- hadrian/ghci-cabal.in
- hadrian/src/Context.hs
- hadrian/src/Flavour.hs
- hadrian/src/Hadrian/Haskell/Hash.hs
- hadrian/src/Settings/Builders/Cabal.hs


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -364,7 +364,6 @@ hadrian-ghc-in-ghci:
     - sudo chown ghc:ghc -R .
   variables:
     GHC_FLAGS: -Werror
-    CABFLAGS: --ghc-option=-Werror
   tags:
     - x86_64-linux
   script:


=====================================
hadrian/ghci-cabal.in
=====================================
@@ -5,6 +5,6 @@
 set -e
 export TOOL_OUTPUT=.hadrian_ghci/ghci_args
 # Replace newlines with spaces, as these otherwise break the ghci invocation on windows.
-CABFLAGS="-v0 $CABFLAGS" "hadrian/build-cabal" tool:compiler/GHC.hs --build-root=.hadrian_ghci --flavour=ghc-in-ghci $HADRIAN_ARGS
+CABFLAGS=-v0 "hadrian/build-cabal" tool:compiler/GHC.hs --build-root=.hadrian_ghci --flavour=ghc-in-ghci $HADRIAN_ARGS
 GHC_FLAGS="$GHC_FLAGS $(cat $TOOL_OUTPUT | tr '\n\r' ' ')"
 @WithGhc@ --interactive $GHC_FLAGS $@ -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 +RTS -A128m


=====================================
hadrian/src/Context.hs
=====================================
@@ -95,7 +95,7 @@ pkgSetupConfigFile context = pkgSetupConfigDir context <&> (-/- "setup-config")
 -- | Path to the haddock file of a given 'Context', e.g.:
 -- @_build/stage1/libraries/array/doc/html/array/array.haddock at .
 pkgHaddockFile :: Context -> Action FilePath
-pkgHaddockFile Context {..} = do
+pkgHaddockFile context at Context {..} = do
     root <- buildRoot
     version <- pkgUnitId stage package
     return $ root -/- "doc/html/libraries" -/- version -/- pkgName package <.> "haddock"
@@ -136,7 +136,7 @@ pkgGhciLibraryFile context at Context {..} = do
 
 -- | Path to the configuration file of a given 'Context'.
 pkgConfFile :: Context -> Action FilePath
-pkgConfFile Context {..} = do
+pkgConfFile context at Context {..} = do
     pid  <- pkgUnitId stage package
     dbPath <- packageDbPath (PackageDbLoc stage iplace)
     return $ dbPath -/- pid <.> "conf"


=====================================
hadrian/src/Flavour.hs
=====================================
@@ -37,6 +37,7 @@ import Text.Parsec.Combinator as P
 import Text.Parsec.Char as P
 import Control.Monad.Except
 import UserSettings
+import Oracles.Flag
 
 
 flavourTransformers :: Map String (Flavour -> Flavour)


=====================================
hadrian/src/Hadrian/Haskell/Hash.hs
=====================================
@@ -31,6 +31,7 @@ import Way
 import Packages
 import Development.Shake.Classes
 import Control.Monad
+import Utilities
 import Base
 import Context
 import System.Directory.Extra (listFilesRecursive)


=====================================
hadrian/src/Settings/Builders/Cabal.hs
=====================================
@@ -57,6 +57,7 @@ commonReinstallCabalArgs :: Args
 commonReinstallCabalArgs = do
     top       <- expr topDirectory
     root      <- getBuildRoot
+    threads   <- shakeThreads <$> expr getShakeOptions
     _pkg      <- getPackage
     compiler  <- expr $ programPath =<< programContext Stage1 ghc
     mconcat [ arg "--project-file"



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e44c3cb27f3e445416505956b18ef5cd04e42919
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/20230717/b8859211/attachment-0001.html>