Skip to content

Commit

Permalink
[chore] Fix ci (#7)
Browse files Browse the repository at this point in the history
* deps: update resolver to ghc 9.4.8

* fix: use proper ghc version for CI

* refactor: use newer haskell "language"
  • Loading branch information
worm2fed authored Dec 14, 2023
1 parent 17a1221 commit 80c6457
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest

env:
GHC_VERSION: 9.2.8
GHC_VERSION: 9.4.8
STACK_LTS: "0" # actual value will be set in later steps

steps:
Expand Down
2 changes: 1 addition & 1 deletion bench/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Servant
, JSON
, Proxy (..)
, serve
, type (:>)
, (:>)
)
import System.Process (callCommand)

Expand Down
13 changes: 5 additions & 8 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,21 @@ extra-doc-files:
tested-with:
- GHC == 9.2.8
- GHC == 9.4.7
- GHC == 9.4.8

verbatim:
cabal-version: 2.4

# GHC's GHC2021 language extension is supported by GHC >= 9.2.1
# for more details see: https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0380-ghc2021.rst
language: GHC2021

default-extensions:
- BangPatterns
- DataKinds
- DeriveAnyClass
- DeriveGeneric
- DerivingStrategies
- FlexibleContexts
- FlexibleInstances
- ImportQualifiedPost
- OverloadedStrings
- PolyKinds
- RecordWildCards
- ScopedTypeVariables
- TypeOperators
- UndecidableInstances

ghc-options:
Expand Down
31 changes: 4 additions & 27 deletions servant-prometheus.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ build-type: Simple
tested-with:
GHC == 9.2.8
, GHC == 9.4.7
, GHC == 9.4.8
extra-source-files:
README.md
LICENSE
Expand All @@ -40,19 +41,11 @@ library
hs-source-dirs:
lib
default-extensions:
BangPatterns
DataKinds
DeriveAnyClass
DeriveGeneric
DerivingStrategies
FlexibleContexts
FlexibleInstances
ImportQualifiedPost
OverloadedStrings
PolyKinds
RecordWildCards
ScopedTypeVariables
TypeOperators
UndecidableInstances
ghc-options: -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-inferred-safe-imports -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-missing-kind-signatures -Wno-implicit-prelude
build-depends:
Expand All @@ -65,7 +58,7 @@ library
, servant >=0.14 && <0.20
, text >=1.2.5 && <2.1
, wai >=3.2.3 && <3.3
default-language: Haskell2010
default-language: GHC2021

test-suite spec
type: exitcode-stdio-1.0
Expand All @@ -78,19 +71,11 @@ test-suite spec
hs-source-dirs:
test
default-extensions:
BangPatterns
DataKinds
DeriveAnyClass
DeriveGeneric
DerivingStrategies
FlexibleContexts
FlexibleInstances
ImportQualifiedPost
OverloadedStrings
PolyKinds
RecordWildCards
ScopedTypeVariables
TypeOperators
UndecidableInstances
ghc-options: -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-inferred-safe-imports -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-missing-kind-signatures -Wno-implicit-prelude -Wno-missing-export-lists -threaded "-with-rtsopts=-N -A64m -AL256m"
build-tool-depends:
Expand All @@ -110,7 +95,7 @@ test-suite spec
, text
, wai
, warp >=3.2.4 && <3.4
default-language: Haskell2010
default-language: GHC2021

benchmark bench
type: exitcode-stdio-1.0
Expand All @@ -122,19 +107,11 @@ benchmark bench
hs-source-dirs:
bench
default-extensions:
BangPatterns
DataKinds
DeriveAnyClass
DeriveGeneric
DerivingStrategies
FlexibleContexts
FlexibleInstances
ImportQualifiedPost
OverloadedStrings
PolyKinds
RecordWildCards
ScopedTypeVariables
TypeOperators
UndecidableInstances
ghc-options: -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-inferred-safe-imports -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-missing-kind-signatures -Wno-implicit-prelude -threaded "-with-rtsopts=-N -A64m -AL256m"
build-depends:
Expand All @@ -145,4 +122,4 @@ benchmark bench
, text
, wai
, warp
default-language: Haskell2010
default-language: GHC2021
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-21.14
resolver: lts-21.24

ghc-options:
# locally install Haddocs for "everything": deps and the project
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
sha256: 60e54c1ba3c1e7163acf6dafa9d56b2d3b23f88a31ad53a1c9d888f32561f8da
size: 639819
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/14.yaml
original: lts-21.14
sha256: abcc4a65c15c7c2313f1a87f01bfd4d910516e1930b99653eef1d2d006515916
size: 640074
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/24.yaml
original: lts-21.24
4 changes: 2 additions & 2 deletions test/Prometheus/ServantSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import Servant
, ReqBody
, Server
, serve
, type (:<|>) (..)
, type (:>)
, (:<|>) (..)
, (:>)
)
import Servant.Client
( BaseUrl (..)
Expand Down

0 comments on commit 80c6457

Please sign in to comment.