From e086a8448047605529d70a0fa04454d1151364db Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Mon, 13 Feb 2023 07:30:48 -0500 Subject: [PATCH] CI: Test GHC 9.4.4, drop 9.0.2 --- .github/workflows/ci.yml | 6 +-- README.md | 4 +- ...GHC-9.0.2.config => cabal.GHC-9.4.4.config | 42 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) rename cabal.GHC-9.0.2.config => cabal.GHC-9.4.4.config (94%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60f9763a8..734c9e913 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,14 +59,14 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04, macos-12, windows-2019] - ghc-version: ["8.10.7", "9.0.2", "9.2.4"] + ghc-version: ["8.10.7", "9.2.4", "9.4.4"] run-tests: [true] exclude: - os: windows-2019 - ghc-version: 9.0.2 + ghc-version: 9.2.4 run-tests: true - os: windows-2019 - ghc-version: 9.2.4 + ghc-version: 9.4.4 run-tests: true include: # We include one job from an older Ubuntu LTS release to increase our diff --git a/README.md b/README.md index 4e996fce6..826408440 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ Windows. We regularly build and test it in the following environments: ## Prerequisites Cryptol is regularly built and tested with the three most recent -versions of GHC, which at the time of this writing are 8.10.7, 9.0.2, and -9.2.4. The easiest way to install an approporiate version of GHC is +versions of GHC, which at the time of this writing are 8.10.7, 9.2.2, and +9.4.4. The easiest way to install an approporiate version of GHC is with [ghcup](https://www.haskell.org/ghcup/). Some supporting non-Haskell libraries are required to build diff --git a/cabal.GHC-9.0.2.config b/cabal.GHC-9.4.4.config similarity index 94% rename from cabal.GHC-9.0.2.config rename to cabal.GHC-9.4.4.config index 513f8ccb9..363d8efea 100644 --- a/cabal.GHC-9.0.2.config +++ b/cabal.GHC-9.4.4.config @@ -1,6 +1,7 @@ active-repositories: hackage.haskell.org:merge constraints: any.BoundedChan ==1.0.3.0, - any.Cabal ==3.4.1.0, + any.Cabal ==3.8.1.0, + any.Cabal-syntax ==3.8.1.0, any.Glob ==0.10.2, any.GraphSCC ==1.0.4, GraphSCC -use-maps, @@ -32,7 +33,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.attoparsec ==0.14.4, attoparsec -developer, any.auto-update ==0.1.6, - any.base ==4.15.1.0, + any.base ==4.17.0.0, any.base-compat ==0.12.2, any.base-compat-batteries ==0.12.2, any.base-orphans ==0.8.7, @@ -41,7 +42,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.bifunctors ==5.5.14, bifunctors +semigroups +tagged, any.bimap ==0.5.0, - any.binary ==0.8.8.0, + any.binary ==0.8.9.1, any.binary-orphans ==1.0.3, any.bitvec ==1.1.3.0, bitvec -libgmp, @@ -52,7 +53,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.bsb-http-chunked ==0.0.0.4, any.bv-sized ==1.0.5, any.byteorder ==1.0.4, - any.bytestring ==0.10.12.1, + any.bytestring ==0.11.3.1, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, @@ -71,7 +72,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.concurrent-extra ==0.7.0.12, any.config-value ==0.8.3, any.constraints ==0.13.4, - any.containers ==0.6.4.1, + any.containers ==0.6.6, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, any.cookie ==0.4.6, @@ -86,14 +87,13 @@ constraints: any.BoundedChan ==1.0.3.0, cryptol-test-runner -static, any.cryptonite ==0.30, cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, - any.data-array-byte ==0.1.0.1, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, - any.deepseq ==1.4.5.0, + any.deepseq ==1.4.8.0, any.dense-linear-algebra ==0.1.0.0, any.deriving-compat ==0.6.2, deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11, - any.directory ==1.3.6.2, + any.directory ==1.3.7.1, any.distributive ==0.6.2.1, distributive +semigroups +tagged, any.dlist ==1.0, @@ -102,18 +102,18 @@ constraints: any.BoundedChan ==1.0.3.0, any.entropy ==0.4.1.10, entropy -donotgetentropy, any.exact-pi ==0.5.0.2, - any.exceptions ==0.10.4, + any.exceptions ==0.10.5, any.extensible-exceptions ==0.1.1.4, any.extra ==1.7.12, any.fast-logger ==3.2.0, any.filelock ==0.1.1.5, - any.filepath ==1.4.2.1, + any.filepath ==1.4.2.2, any.fingertree ==0.1.5.0, any.free ==5.1.10, any.generically ==0.1, - any.ghc-bignum ==1.1, - any.ghc-boot-th ==9.0.2, - any.ghc-prim ==0.7.0, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.4.4, + any.ghc-prim ==0.9.0, any.gitrev ==1.3.1, any.happy ==1.20.1.1, any.hashable ==1.4.2.0, @@ -137,7 +137,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, - any.integer-roots ==1.0.2.0, + any.integer-roots ==1.0.1.0, any.invariant ==0.6, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, @@ -181,7 +181,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.parallel ==3.2.2.0, any.parameterized-utils ==2.1.6.0, parameterized-utils +unsafe-operations, - any.parsec ==3.1.14.0, + any.parsec ==3.1.15.0, any.parser-combinators ==1.3.0, parser-combinators -dev, any.pem ==0.2.4, @@ -189,7 +189,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, any.primitive ==0.7.4.0, - any.process ==1.6.13.2, + any.process ==1.6.16.0, any.profunctors ==5.6.2, any.psqueues ==0.2.7.3, any.quickcheck-instances ==0.3.28, @@ -228,7 +228,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, any.statistics ==0.16.1.2, - any.stm ==2.5.0.0, + any.stm ==2.5.1.0, any.streaming-commons ==0.2.2.5, streaming-commons -use-bytestring-builder, any.strict ==0.4.0.1, @@ -240,14 +240,14 @@ constraints: any.BoundedChan ==1.0.3.0, tasty +unix, any.tasty-hunit ==0.10.0.3, any.tasty-quickcheck ==0.10.2, - any.template-haskell ==2.17.0.0, + any.template-haskell ==2.19.0.0, any.temporary ==1.3, any.terminfo ==0.4.1.5, any.test-framework ==0.8.2.0, any.test-framework-hunit ==0.3.0.2, test-framework-hunit -base3 +base4, any.test-lib ==0.4, - any.text ==1.2.5.0, + any.text ==2.0.1, any.text-short ==0.1.5, text-short -asserts, any.tf-random ==0.5, @@ -256,7 +256,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.th-lift-instances ==0.1.20, any.these ==1.1.1.1, these +assoc, - any.time ==1.9.3, + any.time ==1.12.2, any.time-compat ==1.9.6.1, time-compat -old-locale, any.time-manager ==0.0.0, @@ -271,7 +271,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.type-equality ==1, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, - any.unix ==2.7.2.2, + any.unix ==2.7.3, any.unix-compat ==0.6, unix-compat -old-time, any.unix-time ==0.4.8,