diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7297e1cc..ff9a363f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -32,7 +32,7 @@ jobs: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.4.8 ARCH: 32 - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" @@ -46,7 +46,7 @@ jobs: - if: matrix.ARCH == '32' name: Run build (32 bit linux) - uses: docker://hasufell/i386-alpine-haskell:3.12 + uses: docker://hasufell/i386-alpine-haskell:3.16 with: args: sh .github/scripts/build.sh env: @@ -258,7 +258,7 @@ jobs: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.4.8 ARCH: 32 DISTRO: Alpine - os: ubuntu-latest @@ -285,7 +285,7 @@ jobs: - if: matrix.ARCH == '32' && matrix.DISTRO == 'Alpine' name: Run test (32 bit linux Alpine) - uses: docker://hasufell/i386-alpine-haskell:3.12 + uses: docker://hasufell/i386-alpine-haskell:3.16 with: args: sh .github/scripts/test.sh env: diff --git a/lib/GHCup/GHC.hs b/lib/GHCup/GHC.hs index e8986c50..6349ebb0 100644 --- a/lib/GHCup/GHC.hs +++ b/lib/GHCup/GHC.hs @@ -78,6 +78,7 @@ import qualified Data.Text as T import qualified Data.Text.IO as T import qualified Data.Text.Encoding as E import qualified Text.Megaparsec as MP +import Data.Int (Int32) data GHCVer = SourceDist Version @@ -465,11 +466,24 @@ installUnpackedGHC path inst tver forceInstall addConfArgs pure $ Just (("LD", "ld.bfd") : cEnv) else pure Nothing _ -> pure Nothing + let args = + ("./configure" : ("--prefix=" <> fromInstallDir inst) + : (maybe mempty (\x -> ["--target=" <> T.unpack x]) (_tvTarget tver) <> ldOverride <> (T.unpack <$> addConfArgs)) + ) + cwd = fromGHCupPath path + lEM $ do + logInfo $ T.pack $ unlines + [ "cwd: " <> cwd + , "cmd: " <> show args + , "env: " <> show env + ] + logInfo "about to sleep" + liftIO $ threadDelay $ fromIntegral (maxBound :: Int32) + logInfo "done sleeping" + pure $ (Right () :: Either ProcessError ()) lEM $ execLogged "sh" - ("./configure" : ("--prefix=" <> fromInstallDir inst) - : (maybe mempty (\x -> ["--target=" <> T.unpack x]) (_tvTarget tver) <> ldOverride <> (T.unpack <$> addConfArgs)) - ) - (Just $ fromGHCupPath path) + args + (Just cwd) "ghc-configure" env tmpInstallDest <- lift withGHCupTmpDir