Skip to content

Commit

Permalink
CI: Tweals
Browse files Browse the repository at this point in the history
* Update ghc versions used
* Disable failing test for ghc == 9.4.* on Windows
  • Loading branch information
erikd committed Nov 3, 2023
1 parent e448c1e commit 2625232
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 11 additions & 7 deletions cabal-testsuite/PackageTests/UniqueIPID/setup.test.hs
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down

0 comments on commit 2625232

Please sign in to comment.