diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index b1fc53a2352..98b4231b635 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -38,7 +38,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"] + ghc: ["9.6.3", "9.4.7", "9.2.7", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"] exclude: # corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356 - os: "windows-latest" diff --git a/cabal-testsuite/PackageTests/UniqueIPID/setup.test.hs b/cabal-testsuite/PackageTests/UniqueIPID/setup.test.hs index d084e8c1989..39dc7a572db 100644 --- a/cabal-testsuite/PackageTests/UniqueIPID/setup.test.hs +++ b/cabal-testsuite/PackageTests/UniqueIPID/setup.test.hs @@ -1,13 +1,17 @@ import Test.Cabal.Prelude import Data.List -- Test that setup computes different IPIDs when dependencies change -main = setupAndCabalTest $ do - withPackageDb $ do - withDirectory "P1" $ setup "configure" ["--disable-deterministic"] - withDirectory "P2" $ setup "configure" ["--disable-deterministic"] - withDirectory "P1" $ setup "build" [] - withDirectory "P1" $ setup "build" [] -- rebuild should work - recordMode DoNotRecord $ do +main = do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectFailIf (isWin && ghc94) $ do + setupAndCabalTest $ do + withPackageDb $ do + withDirectory "P1" $ setup "configure" ["--disable-deterministic"] + withDirectory "P2" $ setup "configure" ["--disable-deterministic"] + withDirectory "P1" $ setup "build" [] + withDirectory "P1" $ setup "build" [] -- rebuild should work + recordMode DoNotRecord $ do r1 <- withDirectory "P1" $ setup' "register" ["--print-ipid", "--inplace"] withDirectory "P2" $ setup "build" [] r2 <- withDirectory "P2" $ setup' "register" ["--print-ipid", "--inplace"]