Skip to content

Commit

Permalink
Add GHC 9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
mbj committed Dec 11, 2024
1 parent ac0d280 commit ace7942
Show file tree
Hide file tree
Showing 7 changed files with 369 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['9.4', '9.6']
ghc: ['9.4', '9.6', '9.8']
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
Expand All @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['9.4', '9.6']
ghc: ['9.4', '9.6', '9.8']
os: [ubuntu-latest]
project:
- aws-checkip
Expand Down
3 changes: 3 additions & 0 deletions source-constraints/src/SourceConstraints.hs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ mkWarnMsg :: DiagOpts -> SrcSpan -> PrintUnqualified -> SDoc -> Message
mkWarnMsg diagOpts srcSpan printUnqualified sdoc
= MsgEnvelope
{ errMsgContext = printUnqualified
#if MIN_VERSION_base(4,19,0)
, errMsgReason = ResolvedDiagnosticReason WarningWithoutFlag
#endif
, errMsgDiagnostic = ghcUnknownMessage $ mkPlainDiagnostic WarningWithoutFlag [] sdoc
, errMsgSeverity = (diagReasonSeverity diagOpts WarningWithoutFlag)
, errMsgSpan = srcSpan
Expand Down
10 changes: 8 additions & 2 deletions source-constraints/test/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ getWarnings file = runGhc (pure libdir) $ do
render sDocContext warning = do
caretDiagnostic <- liftIO $
getCaretDiagnostic
#if MIN_VERSION_base(4,18,0)
#if MIN_VERSION_base(4,19,0)
(MCDiagnostic (errMsgSeverity warning) (ResolvedDiagnosticReason WarningWithoutFlag) Nothing)
#elif MIN_VERSION_base(4,18,0)
(MCDiagnostic (errMsgSeverity warning) WarningWithoutFlag Nothing)
#else
(MCDiagnostic (errMsgSeverity warning) WarningWithoutFlag)
Expand All @@ -126,7 +128,11 @@ getWarnings file = runGhc (pure libdir) $ do

pure $ renderWithContext
sDocContext
#if MIN_VERSION_base(4,18,0)
#if MIN_VERSION_base(4,19,0)
(formatBulleted
(diagnosticMessage (defaultDiagnosticOpts @GhcMessage) $ errMsgDiagnostic warning) $+$ caretDiagnostic
)
#elif MIN_VERSION_base(4,18,0)
(formatBulleted
sDocContext
(diagnosticMessage (defaultDiagnosticOpts @GhcMessage) $ errMsgDiagnostic warning) $+$ caretDiagnostic
Expand Down
106 changes: 106 additions & 0 deletions stack-9.8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
resolver: lts-23.0
extra-deps:
- mprelude
- github: mbj/stratosphere
commit: d1b638820ca9fd90f7d5afba535415da47252af5
subdirs:
- .
- services/cloudwatch
- services/ecs
- services/events
- services/iam
- services/lambda
- services/logs
- services/s3
- services/secretsmanager
- github: brendanhay/amazonka
commit: 30b200d487bccd2568de1257a812a464270d0096
subdirs:
- lib/amazonka
- lib/amazonka-core
- lib/services/amazonka-cloudformation
- lib/services/amazonka-ec2
- lib/services/amazonka-lambda
- lib/services/amazonka-s3
- lib/services/amazonka-secretsmanager
- lib/services/amazonka-sso
- lib/services/amazonka-sts
flags:
aws-checkip:
development: true
aws-rds:
development: true
aws-secrets:
development: true
aws-temporary-ingress-rule:
development: true
bounded:
development: true
cbt:
development: true
cli-utils:
development: true
conversions:
development: true
dbt:
development: true
devtools:
development: true
http-mclient:
development: true
lambda-alb:
development: true
lambda-runtime:
development: true
lht:
development: true
mio-amazonka:
development: true
mio-core:
development: true
mio-log:
development: true
mprelude:
development: true
oauth:
development: true
openapi:
development: true
pgt:
development: true
source-constraints:
development: true
stack-deploy:
development: true
tasty-mgolden:
development: true
work-pool:
development: true
xray:
development: true
packages:
- aws-checkip
- aws-rds
- aws-secrets
- aws-temporary-ingress-rule
- bounded
- cbt
- cli-utils
- conversions
- dbt
- devtools
- http-mclient
- lambda-alb
- lambda-runtime
- lht
- mio-amazonka
- mio-core
- mio-log
- oauth
- openapi
- pgt
- source-constraints
- stack-deploy
- tasty-mgolden
- work-pool
- xray
Loading

0 comments on commit ace7942

Please sign in to comment.