Skip to content

Commit

Permalink
Bump base to allow GHC 9.2; update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasabel committed Nov 13, 2021
1 parent 8ca56bd commit 63f9d20
Show file tree
Hide file tree
Showing 5 changed files with 125 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.2.1
compilerKind: ghc
compilerVersion: 9.2.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.1
compilerKind: ghc
compilerVersion: 9.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-18.04
strategy:
matrix:
ghc-ver: [9.0.1, 8.10.7, 8.8.4, 8.6.5, 8.4.4, 8.2.2, 8.0.2]
ghc-ver: [9.2.1, 9.0.1, 8.10.7, 8.8.4, 8.6.5, 8.4.4, 8.2.2, 8.0.2]
fail-fast: false
env:
ARGS: "--stack-yaml stack-${{ matrix.ghc-ver }}.yaml --no-terminal --system-ghc"
Expand Down
3 changes: 2 additions & 1 deletion fix-whitespace.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ tested-with: GHC == 8.0.2
GHC == 8.8.4
GHC == 8.10.7
GHC == 9.0.1
GHC == 9.2.1

extra-source-files:
CHANGELOG.md
Expand All @@ -44,7 +45,7 @@ executable fix-whitespace
LambdaCase
ScopedTypeVariables

build-depends: base >= 4.9.0.0 && < 4.16
build-depends: base >= 4.9.0.0 && < 4.17
, directory >= 1.2.6.2 && < 1.4
, extra >= 1.1 && < 2.0
, filepath >= 1.4.1.0 && < 1.5
Expand Down
2 changes: 1 addition & 1 deletion stack-9.0.1.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2021-07-29
resolver: nightly-2021-11-12
compiler: ghc-9.0.1
compiler-check: match-exact

Expand Down
116 changes: 116 additions & 0 deletions stack-9.2.1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
resolver: ghc-9.2.1
compiler: ghc-9.2.1
compiler-check: match-exact

extra-deps:
- OneTuple-0.3.1
- StateVar-1.2.2
- aeson-2.0.2.0
- array-0.5.4.0
- assoc-1.0.2
- attoparsec-0.14.2
- base-compat-0.12.1
- base-compat-batteries-0.12.1
- base-orphans-0.8.6
- bifunctors-5.5.11
- binary-0.8.9.0
- bytestring-0.11.1.0
- clock-0.8.2
- comonad-5.0.8
- conduit-1.3.4.2
- containers-0.6.5.1
- contravariant-1.5.5
- data-fix-0.3.2
- deepseq-1.4.6.0
- directory-1.3.6.2
- distributive-0.6.2.1
- dlist-1.0
- exceptions-0.10.4
- extra-1.7.10
- filepath-1.4.2.1
- filepattern-0.1.2
- ghc-bignum-1.2
- ghc-boot-th-9.2.1
- ghc-prim-0.8.0
- hashable-1.4.0.0
- indexed-traversable-0.1.2
- indexed-traversable-instances-0.1.1
- integer-logarithms-1.0.3.1
- libyaml-0.1.2
- mono-traversable-1.0.15.3
- mtl-2.2.2
- pretty-1.1.3.6
- primitive-0.7.3.0
- process-1.6.13.2
- random-1.2.1
- resourcet-1.2.4.3
- scientific-0.3.7.0
- semialign-1.2.0.1
- semigroupoids-5.3.6
- split-0.2.3.4
- splitmix-0.1.0.4
- stm-2.5.0.0
- strict-0.4.0.1
- tagged-0.8.6.1
- template-haskell-2.18.0.0
- text-1.2.5.0
- text-short-0.1.4
- th-abstraction-0.4.3.0
- these-1.1.1.1
- time-1.11.1.1
- time-compat-1.9.6.1
- transformers-0.5.6.2
- transformers-compat-0.7.1
- unix-2.7.2.2
- unliftio-core-0.2.0.1
- unordered-containers-0.2.15.0
- uuid-types-1.0.5
- vector-0.12.3.1
- vector-algorithms-0.8.0.4
- witherable-0.4.2
- yaml-0.11.7.0

# - aeson-2.0.2.0
# - assoc-1.0.2
# - attoparsec-0.13.2.4
# - base-compat-0.11.2
# - base-compat-batteries-0.11.2
# - base-orphans-0.8.4
# - bifunctors-5.5.10
# - clock-0.8.2
# - comonad-5.0.8
# - conduit-1.3.4
# - data-fix-0.3.1
# - distributive-0.6.2.1
# - dlist-1.0
# - extra-1.7.9
# - indexed-traversable-0.1.1
# - integer-logarithms-1.0.3.1
# - filepattern-0.1.2
# - hashable-1.3.1.0
# - libyaml-0.1.2
# - mono-traversable-1.0.15.1
# - primitive-0.7.1.0
# - random-1.2.0
# - resourcet-1.2.4.2
# - scientific-0.3.6.2
# - split-0.2.3.4
# - splitmix-0.1.0.3
# - strict-0.4.0.1
# - tagged-0.8.6.1
# - th-abstraction-0.4.2.0
# - these-1.1.1.1
# - time-compat-1.9.5
# - transformers-compat-0.6.6
# - unliftio-core-0.2.0.1
# - unordered-containers-0.2.13.0
# - uuid-types-1.0.4
# - vector-0.12.2.0
# - vector-algorithms-0.8.0.4
# - yaml-0.11.5.0

allow-newer: true

flags:
transformers-compat:
five-three: true

0 comments on commit 63f9d20

Please sign in to comment.