Skip to content

Commit 9f6d19f

Browse files
ShimuuarShimuuar
authored
Merge pull request #573 from haskell/inspection-914
Fix inspection testing with GHC9.14 and add GHC9.14 to CI
2 parents 68a6842 + 1cd331b commit 9f6d19f

4 files changed

Lines changed: 38 additions & 28 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,38 @@ jobs:
1818
matrix:
1919
include:
2020
# Linux
21-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "8.8.4" }
22-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "8.10.7" }
23-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.0.2" }
24-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.2.8" }
25-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.4.8" }
26-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.6.7" }
27-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.6.7",
21+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "8.8.4" }
22+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "8.10.7" }
23+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.0.2" }
24+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.2.8" }
25+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.4.8" }
26+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.6.7" }
27+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.6.7",
2828
flags: "-fUnsafeChecks -fInternalChecks" }
29-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.8.4" }
30-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.10.2" }
31-
- { cabal: "3.14", os: ubuntu-24.04, ghc: "9.12.2" }
29+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.8.4" }
30+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.10.2" }
31+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.12.2" }
32+
- { cabal: "3.16", os: ubuntu-24.04, ghc: "9.14.1" }
3233
# Win
33-
- { cabal: "3.14", os: windows-latest, ghc: "9.6.7" }
34-
- { cabal: "3.14", os: windows-latest, ghc: "9.8.4" }
35-
- { cabal: "3.14", os: windows-latest, ghc: "9.10.2" }
36-
- { cabal: "3.14", os: windows-latest, ghc: "9.12.2" }
34+
- { cabal: "3.16", os: windows-latest, ghc: "9.6.7" }
35+
- { cabal: "3.16", os: windows-latest, ghc: "9.8.4" }
36+
- { cabal: "3.16", os: windows-latest, ghc: "9.10.2" }
37+
- { cabal: "3.16", os: windows-latest, ghc: "9.12.2" }
38+
- { cabal: "3.16", os: windows-latest, ghc: "9.14.1" }
3739
# MacOS
3840
#
3941
# Fails with:
4042
# > <command line>: can't load framework: Security (not found)
41-
# - { cabal: "3.14", os: macOS-15-intel, ghc: "8.8.4" }
42-
- { cabal: "3.14", os: macOS-15-intel, ghc: "8.10.7" }
43-
- { cabal: "3.14", os: macOS-15-intel, ghc: "9.0.2" }
44-
- { cabal: "3.14", os: macOS-latest, ghc: "9.2.8" }
45-
- { cabal: "3.14", os: macOS-latest, ghc: "9.4.8" }
46-
- { cabal: "3.14", os: macOS-latest, ghc: "9.6.7" }
47-
- { cabal: "3.14", os: macOS-latest, ghc: "9.8.4" }
48-
- { cabal: "3.14", os: macOS-latest, ghc: "9.10.2" }
49-
- { cabal: "3.14", os: macOS-latest, ghc: "9.12.2" }
43+
# - { cabal: "3.16", os: macOS-15-intel, ghc: "8.8.4" }
44+
- { cabal: "3.16", os: macOS-15-intel, ghc: "8.10.7" }
45+
- { cabal: "3.16", os: macOS-15-intel, ghc: "9.0.2" }
46+
- { cabal: "3.16", os: macOS-latest, ghc: "9.2.8" }
47+
- { cabal: "3.16", os: macOS-latest, ghc: "9.4.8" }
48+
- { cabal: "3.16", os: macOS-latest, ghc: "9.6.7" }
49+
- { cabal: "3.16", os: macOS-latest, ghc: "9.8.4" }
50+
- { cabal: "3.16", os: macOS-latest, ghc: "9.10.2" }
51+
- { cabal: "3.16", os: macOS-latest, ghc: "9.12.2" }
52+
- { cabal: "3.16", os: macOS-latest, ghc: "9.14.1" }
5053
fail-fast: false
5154

5255
steps:

‎vector/tests-inspect/Inspect/DerivingVia.hs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import qualified Data.Vector.Generic.Mutable as VGM
1919
import qualified Data.Vector.Unboxed as VU
2020
import GHC.Generics (Generic)
2121

22+
import Test.InspectExtra
2223
import Inspect.DerivingVia.OtherFoo
2324

2425

@@ -64,12 +65,12 @@ pipeline_OtherFoo n
6465
-- and even mentions of Foo data type.
6566
tests :: TestTree
6667
tests = testGroup "iso-deriving"
67-
[ $(inspectObligations [(`doesNotUse` 'Foo), hasNoGenerics, hasNoTypeClasses]
68+
[ $(inspectObligations [(`doesNotUse` 'Foo), hasNoGenerics, hasNoTypeClasses']
6869
'map_Foo)
69-
, $(inspectObligations [(`doesNotUse` 'OtherFoo), hasNoGenerics, hasNoTypeClasses]
70+
, $(inspectObligations [(`doesNotUse` 'OtherFoo), hasNoGenerics, hasNoTypeClasses']
7071
'pipeline_Foo)
71-
, $(inspectObligations [(`doesNotUse` 'OtherFoo), hasNoGenerics, hasNoTypeClasses]
72+
, $(inspectObligations [(`doesNotUse` 'OtherFoo), hasNoGenerics, hasNoTypeClasses']
7273
'map_OtherFoo)
73-
, $(inspectObligations [(`doesNotUse` 'OtherFoo), hasNoGenerics, hasNoTypeClasses]
74+
, $(inspectObligations [(`doesNotUse` 'OtherFoo), hasNoGenerics, hasNoTypeClasses']
7475
'pipeline_OtherFoo)
7576
]

‎vector/tests-inspect/Test/InspectExtra.hs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ module Test.InspectExtra
55
( noStream
66
, inspectFusion
77
, inspectClassyFusion
8+
, hasNoTypeClasses'
89
, module Test.Tasty.Inspection
910
) where
1011

1112
import Language.Haskell.TH (Name,Q,Exp)
1213
import Test.Tasty.Inspection
14+
import GHC.Base (IP)
1315

1416
import qualified Data.Stream.Monadic as S
1517

@@ -19,8 +21,11 @@ noStream = (`doesNotUseAnyOf` ['S.Yield, 'S.Skip, 'S.Done])
1921

2022
inspectFusion :: Name -> Q Exp
2123
inspectFusion = inspectObligations [ noStream
22-
, hasNoTypeClasses
24+
, hasNoTypeClasses'
2325
]
2426

2527
inspectClassyFusion :: Name -> Q Exp
2628
inspectClassyFusion = inspectObligations [ noStream ]
29+
30+
hasNoTypeClasses' :: Name -> Obligation
31+
hasNoTypeClasses' e = hasNoTypeClassesExcept e [''IP]

‎vector/vector.cabal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Tested-With:
5252
GHC == 9.8.4
5353
GHC == 9.10.2
5454
GHC == 9.12.2
55+
GHC == 9.14.1
5556

5657
Extra-doc-files:
5758
changelog.md

0 commit comments

Comments
 (0)