From 918bcb0bf465e513eea64990566bf3295cdae934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20L=C3=A4ndle?= <969523+alaendle@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:16:18 +0200 Subject: [PATCH] Support GHC 9.6. --- .github/workflows/haskell-ci.yml | 21 +++++++++++++-------- influxdb.cabal | 9 +++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 6995c9b..144b2d1 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.16.1 +# version: 0.16.5 # -# REGENDATA ("0.16.1",["github","influxdb.cabal"]) +# REGENDATA ("0.16.5",["github","influxdb.cabal"]) # name: Haskell-CI on: @@ -33,6 +33,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.6.2 + compilerKind: ghc + compilerVersion: 9.6.2 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.4.5 compilerKind: ghc compilerVersion: 9.4.5 @@ -43,15 +48,15 @@ jobs: compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - - compiler: ghc-9.0.1 + - compiler: ghc-9.0.2 compilerKind: ghc - compilerVersion: 9.0.1 - setup-method: hvr-ppa + compilerVersion: 9.0.2 + setup-method: ghcup allow-failure: false - - compiler: ghc-8.10.4 + - compiler: ghc-8.10.7 compilerKind: ghc - compilerVersion: 8.10.4 - setup-method: hvr-ppa + compilerVersion: 8.10.7 + setup-method: ghcup allow-failure: false - compiler: ghc-8.8.4 compilerKind: ghc diff --git a/influxdb.cabal b/influxdb.cabal index 6ce6ad5..59001b2 100644 --- a/influxdb.cabal +++ b/influxdb.cabal @@ -18,10 +18,11 @@ tested-with: GHC == 8.4.4 GHC == 8.6.5 GHC == 8.8.4 - GHC == 8.10.4 - GHC == 9.0.1 + GHC == 8.10.7 + GHC == 9.0.2 GHC == 9.2.8 GHC == 9.4.5 + GHC == 9.6.2 extra-source-files: README.md @@ -78,7 +79,7 @@ library ViewPatterns ghc-options: -Wall build-depends: - base >= 4.11 && < 4.18 + base >= 4.11 && < 4.19 , aeson >= 0.7 && < 2.2 , attoparsec < 0.15 , bytestring >= 0.10 && < 0.12 @@ -104,7 +105,7 @@ test-suite doctests main-is: doctests.hs build-depends: base - , doctest >= 0.11.3 && < 0.21 + , doctest >= 0.11.3 && < 0.22 , influxdb , template-haskell < 2.21 ghc-options: -Wall -threaded