Skip to content

Commit d2f40f8

Browse files
committed
CI: Tweaks
* Update ghc versions used. * Disable huge number of failing test for ghc == 9.4.* on Windows.
1 parent 5d1521b commit d2f40f8

File tree

59 files changed

+263
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+263
-77
lines changed

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
41-
ghc: ["9.6.3", "9.4.7", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
41+
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"]
4242
exclude:
4343
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
4444
- os: "windows-latest"

cabal-testsuite/PackageTests/Ambiguity/setup-package-import.test.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import Test.Cabal.Prelude
33
-- qualified imports. (Paper Backpack doesn't natively support
44
-- this but we must!)
55
main = setupAndCabalTest $ do
6+
isWin <- isWindows
7+
ghc94 <- isGhcVersion "== 9.4.*"
8+
expectBrokenIf (isWin && ghc94) 9414 $
69
withPackageDb $ do
710
withDirectory "p" $ setup_install []
811
withDirectory "q" $ setup_install []

cabal-testsuite/PackageTests/Ambiguity/setup-reexport.test.hs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ import Test.Cabal.Prelude
22
-- Test that we can resolve a module name ambiguity when reexporting
33
-- by explicitly specifying what package we want.
44
main = setupAndCabalTest $ do
5-
skipUnlessGhcVersion ">= 7.9"
6-
withPackageDb $ do
5+
isWin <- isWindows
6+
ghc94 <- isGhcVersion "== 9.4.*"
7+
expectBrokenIf (isWin && ghc94) 9414 $ do
8+
skipUnlessGhcVersion ">= 7.9"
9+
withPackageDb $ do
710
withDirectory "p" $ setup_install []
811
withDirectory "q" $ setup_install []
912
withDirectory "reexport" $ setup_install []

cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.test.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3+
isWin <- isWindows
4+
ghc94 <- isGhcVersion "== 9.4.*"
5+
expectBrokenIf (isWin && ghc94) 9414 $ do
36
skipUnlessGhcVersion ">= 8.1"
47
withPackageDb $ do
58
setup_install ["--cabal-file", "Includes2.cabal"]

cabal-testsuite/PackageTests/Backpack/Includes3/setup-internal.test.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3+
isWin <- isWindows
4+
ghc94 <- isGhcVersion "== 9.4.*"
5+
expectBrokenIf (isWin && ghc94) 9414 $ do
36
skipUnlessGhcVersion ">= 8.1"
47
withPackageDb $ do
58
setup_install []

cabal-testsuite/PackageTests/Backpack/Includes4/setup.test.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3+
isWin <- isWindows
4+
ghc94 <- isGhcVersion "== 9.4.*"
5+
expectBrokenIf (isWin && ghc94) 9414 $ do
36
skipUnlessGhcVersion ">= 8.1"
47
withPackageDb $ do
58
setup_install []

cabal-testsuite/PackageTests/Backpack/Includes5/setup.test.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3+
isWin <- isWindows
4+
ghc94 <- isGhcVersion "== 9.4.*"
5+
expectBrokenIf (isWin && ghc94) 9414 $ do
36
skipUnlessGhcVersion ">= 8.1"
47
setup "configure" []
58
r <- fails $ setup' "build" []

cabal-testsuite/PackageTests/Backpack/Reexport1/setup.test.hs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3-
skipUnlessGhcVersion ">= 8.1"
3+
skipUnlessGhcVersion ">= 8.1"
4+
isWin <- isWindows
5+
ghc94 <- isGhcVersion "== 9.4.*"
6+
expectBrokenIf (isWin && ghc94) 9414 $
47
withPackageDb $ do
58
withDirectory "p" $ setup_install_with_docs []
69
withDirectory "q" $ do
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3-
skipUnlessGhcVersion ">= 8.1"
3+
skipUnlessGhcVersion ">= 8.1"
4+
isWin <- isWindows
5+
ghc94 <- isGhcVersion "== 9.4.*"
6+
expectBrokenIf (isWin && ghc94) 9414 $ do
47
skipUnless "no profiling libs" =<< hasProfiledLibraries
58
setup "configure" ["--enable-profiling"]
69
setup "build" []
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3-
skipUnlessGhcVersion ">= 8.1"
3+
skipUnlessGhcVersion ">= 8.1"
4+
isWin <- isWindows
5+
ghc94 <- isGhcVersion "== 9.4.*"
6+
expectBrokenIf (isWin && ghc94) 9414 $ do
47
setup "configure" []
58
setup "build" []

0 commit comments

Comments
 (0)