Skip to content

Commit

Permalink
Merge pull request #1572 from GaloisInc/ghc-9.6
Browse files Browse the repository at this point in the history 
Support building with GHC 9.6
  • Loading branch information
@RyanGlScott
RyanGlScott authored Sep 2, 2023
2 parents 3973b15 + 55fb062 commit bd35c9b
Show file tree
Hide file tree
Showing 10 changed files with 128 additions and 98 deletions.
22 changes: 16 additions & 6 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-12, windows-2019]
ghc-version: ["8.10.7", "9.2.8", "9.4.5"]
cabal: [ '3.8.1.0' ]
ghc-version: ["9.2.8", "9.4.7", "9.6.2"]
cabal: [ '3.10.1.0' ]
run-tests: [true]
exclude:
- os: windows-2019
ghc-version: 8.10.7
ghc-version: 9.4.7
run-tests: true
- os: windows-2019
ghc-version: 9.4.5
ghc-version: 9.6.2
run-tests: true
include:
# We include one job from an older Ubuntu LTS release to increase our
Expand Down Expand Up @@ -114,8 +114,8 @@ jobs:
cabal user-config update -a "extra-include-dirs: \"\""
cabal user-config update -a "extra-lib-dirs: \"\""
- uses: actions/cache@v2
name: Cache cabal store
- uses: actions/cache/restore@v3
name: Restore cache store cache
with:
path: |
${{ steps.setup-haskell.outputs.cabal-store }}
Expand Down Expand Up @@ -238,6 +238,16 @@ jobs:
if-no-files-found: error
retention-days: ${{ needs.config.outputs.retention-days }}

- uses: actions/cache/save@v3
name: Save cache store cache
if: always()
with:
path: |
${{ steps.setup-haskell.outputs.cabal-store }}
dist-newstyle
key: ${{ env.CACHE_VERSION }}-cabal-${{ matrix.os }}-${{ matrix.ghc-version }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc-version)) }}-${{ github.sha }}
${{ env.CACHE_VERSION }}-cabal-${{ matrix.os }}-${{ matrix.ghc-version }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc-version)) }}-

test:
runs-on: ${{ matrix.os }}
needs: [build]
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.8, and
9.4.5. The easiest way to install an appropriate version of GHC is
versions of GHC, which at the time of this writing are 9.2.8, 9.4.7, and
9.6.2. The easiest way to install an appropriate version of GHC is
with [ghcup](https://www.haskell.org/ghcup/).

Some supporting non-Haskell libraries are required to build
Expand Down
36 changes: 21 additions & 15 deletions cabal.GHC-9.2.8.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ constraints: any.BoundedChan ==1.0.3.0,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.adjunctions ==4.4.2,
any.aeson ==2.1.2.1,
aeson -cffi +ordered-keymap,
any.aeson ==2.2.0.0,
aeson +ordered-keymap,
any.alex ==3.4.0.0,
any.ansi-terminal ==1.0,
ansi-terminal -example,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
any.ansi-wl-pprint ==1.0.2,
ansi-wl-pprint -example,
any.appar ==0.1.8,
any.arithmoi ==0.13.0.0,
Expand All @@ -45,10 +45,10 @@ constraints: any.BoundedChan ==1.0.3.0,
any.bimap ==0.5.0,
any.binary ==0.8.9.0,
any.binary-orphans ==1.0.4.1,
any.bitvec ==1.1.4.0,
bitvec -libgmp,
any.bitvec ==1.1.5.0,
bitvec +simd,
any.bitwise ==1.0.0.1,
any.blaze-builder ==0.4.2.2,
any.blaze-builder ==0.4.2.3,
any.blaze-html ==0.9.1.2,
any.blaze-markup ==0.8.2.8,
any.bsb-http-chunked ==0.0.0.4,
Expand Down Expand Up @@ -77,7 +77,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.6,
any.criterion ==1.6.1.0,
any.criterion ==1.6.3.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.1.0,
criterion-measurement -fast,
Expand Down Expand Up @@ -143,6 +143,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.indexed-traversable ==0.1.2.1,
any.indexed-traversable-instances ==0.1.1.2,
any.infinite-list ==0.1,
any.integer-conversion ==0.1,
any.integer-gmp ==1.1,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
Expand All @@ -154,17 +155,17 @@ constraints: any.BoundedChan ==1.0.3.0,
any.js-chart ==2.9.4.1,
any.kan-extensions ==5.2.5,
any.language-c99 ==0.2.0,
any.language-c99-simple ==0.2.2,
any.language-c99-simple ==0.2.3,
any.language-c99-util ==0.2.0,
any.lens ==5.2.2,
any.lens ==5.2.3,
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
any.libBF ==0.6.6,
libBF -system-libbf,
any.libffi ==0.2.1,
libffi +ghc-bundled-libffi,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.4.1,
any.megaparsec ==9.5.0,
megaparsec -dev,
any.memory ==0.18.0,
memory +support_bytestring +support_deepseq,
Expand All @@ -179,11 +180,12 @@ constraints: any.BoundedChan ==1.0.3.0,
network -devel,
any.network-byte-order ==0.1.6,
any.network-info ==0.2.1,
any.network-uri ==2.6.4.2,
any.newtype-generics ==0.6.2,
any.numtype-dk ==0.5.0.3,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.3,
any.optparse-applicative ==0.16.1.0,
any.optparse-applicative ==0.18.1.0,
optparse-applicative +process,
any.ordered-containers ==0.2.3,
any.panic ==0.4.0.1,
Expand All @@ -198,6 +200,8 @@ constraints: any.BoundedChan ==1.0.3.0,
any.pretty-show ==1.10,
any.prettyprinter ==1.7.1,
prettyprinter -buildreadme +text,
any.prettyprinter-ansi-terminal ==1.1.3,
any.prettyprinter-compat-ansi-wl-pprint ==1.0.2,
any.primitive ==0.8.0.0,
any.process ==1.6.16.0,
any.profunctors ==5.6.2,
Expand Down Expand Up @@ -257,18 +261,20 @@ constraints: any.BoundedChan ==1.0.3.0,
test-framework-hunit -base3 +base4,
any.test-lib ==0.4,
any.text ==1.2.5.0,
any.text-iso8601 ==0.1,
any.text-short ==0.1.5,
text-short -asserts,
any.tf-random ==0.5,
any.th-abstraction ==0.5.0.0,
any.th-compat ==0.1.4,
any.th-lift ==0.8.4,
any.th-lift-instances ==0.1.20,
any.these ==1.2,
any.time ==1.11.1.1,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.time-manager ==0.0.0,
any.tls ==1.7.1,
any.time-manager ==0.0.1,
any.tls ==1.8.0,
tls +compat -hans +network,
any.tls-session-manager ==0.0.4,
any.transformers ==0.5.6.2,
Expand Down Expand Up @@ -308,7 +314,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.wai-logger ==2.4.0,
any.warp ==3.3.28,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.warp-tls ==3.4.0,
any.warp-tls ==3.4.1,
any.what4 ==1.5,
what4 -drealtestdisable -solvertests -stptestdisable,
any.witherable ==0.4.2,
Expand All @@ -318,4 +324,4 @@ constraints: any.BoundedChan ==1.0.3.0,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2023-08-12T09:08:58Z
index-state: hackage.haskell.org 2023-08-30T21:35:34Z
46 changes: 26 additions & 20 deletions cabal.GHC-9.4.5.config → cabal.GHC-9.4.7.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ constraints: any.BoundedChan ==1.0.3.0,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.adjunctions ==4.4.2,
any.aeson ==2.1.2.1,
aeson -cffi +ordered-keymap,
any.aeson ==2.2.0.0,
aeson +ordered-keymap,
any.alex ==3.4.0.0,
any.ansi-terminal ==1.0,
ansi-terminal -example,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
any.ansi-wl-pprint ==1.0.2,
ansi-wl-pprint -example,
any.appar ==0.1.8,
any.arithmoi ==0.13.0.0,
Expand All @@ -35,7 +35,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.auto-update ==0.1.6,
any.base ==4.17.1.0,
any.base ==4.17.2.0,
any.base-compat ==0.12.3,
any.base-compat-batteries ==0.12.3,
any.base-orphans ==0.9.0,
Expand All @@ -46,16 +46,16 @@ constraints: any.BoundedChan ==1.0.3.0,
any.bimap ==0.5.0,
any.binary ==0.8.9.1,
any.binary-orphans ==1.0.4.1,
any.bitvec ==1.1.4.0,
bitvec -libgmp,
any.bitvec ==1.1.5.0,
bitvec +simd,
any.bitwise ==1.0.0.1,
any.blaze-builder ==0.4.2.2,
any.blaze-builder ==0.4.2.3,
any.blaze-html ==0.9.1.2,
any.blaze-markup ==0.8.2.8,
any.bsb-http-chunked ==0.0.0.4,
any.bv-sized ==1.0.5,
any.byteorder ==1.0.4,
any.bytestring ==0.11.4.0,
any.bytestring ==0.11.5.2,
any.cabal-doctest ==1.0.9,
any.call-stack ==0.4.0,
any.case-insensitive ==1.2.1.0,
Expand All @@ -78,7 +78,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.6,
any.criterion ==1.6.1.0,
any.criterion ==1.6.3.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.1.0,
criterion-measurement -fast,
Expand Down Expand Up @@ -119,8 +119,8 @@ constraints: any.BoundedChan ==1.0.3.0,
any.free ==5.2,
any.generically ==0.1.1,
any.ghc-bignum ==1.3,
any.ghc-boot-th ==9.4.5,
any.ghc-prim ==0.9.0,
any.ghc-boot-th ==9.4.7,
any.ghc-prim ==0.9.1,
any.gitrev ==1.3.1,
any.happy ==1.20.1.1,
any.hashable ==1.4.3.0,
Expand All @@ -143,6 +143,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.indexed-traversable ==0.1.2.1,
any.indexed-traversable-instances ==0.1.1.2,
any.infinite-list ==0.1,
any.integer-conversion ==0.1,
any.integer-gmp ==1.1,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
Expand All @@ -154,17 +155,17 @@ constraints: any.BoundedChan ==1.0.3.0,
any.js-chart ==2.9.4.1,
any.kan-extensions ==5.2.5,
any.language-c99 ==0.2.0,
any.language-c99-simple ==0.2.2,
any.language-c99-simple ==0.2.3,
any.language-c99-util ==0.2.0,
any.lens ==5.2.2,
any.lens ==5.2.3,
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
any.libBF ==0.6.6,
libBF -system-libbf,
any.libffi ==0.2.1,
libffi +ghc-bundled-libffi,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.4.1,
any.megaparsec ==9.5.0,
megaparsec -dev,
any.memory ==0.18.0,
memory +support_bytestring +support_deepseq,
Expand All @@ -179,11 +180,12 @@ constraints: any.BoundedChan ==1.0.3.0,
network -devel,
any.network-byte-order ==0.1.6,
any.network-info ==0.2.1,
any.network-uri ==2.6.4.2,
any.newtype-generics ==0.6.2,
any.numtype-dk ==0.5.0.3,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.3,
any.optparse-applicative ==0.16.1.0,
any.optparse-applicative ==0.18.1.0,
optparse-applicative +process,
any.ordered-containers ==0.2.3,
any.panic ==0.4.0.1,
Expand All @@ -198,8 +200,10 @@ constraints: any.BoundedChan ==1.0.3.0,
any.pretty-show ==1.10,
any.prettyprinter ==1.7.1,
prettyprinter -buildreadme +text,
any.prettyprinter-ansi-terminal ==1.1.3,
any.prettyprinter-compat-ansi-wl-pprint ==1.0.2,
any.primitive ==0.8.0.0,
any.process ==1.6.16.0,
any.process ==1.6.17.0,
any.profunctors ==5.6.2,
any.psqueues ==0.2.7.3,
any.quickcheck-instances ==0.3.29.1,
Expand Down Expand Up @@ -257,18 +261,20 @@ constraints: any.BoundedChan ==1.0.3.0,
test-framework-hunit -base3 +base4,
any.test-lib ==0.4,
any.text ==2.0.2,
any.text-iso8601 ==0.1,
any.text-short ==0.1.5,
text-short -asserts,
any.tf-random ==0.5,
any.th-abstraction ==0.5.0.0,
any.th-compat ==0.1.4,
any.th-lift ==0.8.4,
any.th-lift-instances ==0.1.20,
any.these ==1.2,
any.time ==1.12.2,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.time-manager ==0.0.0,
any.tls ==1.7.1,
any.time-manager ==0.0.1,
any.tls ==1.8.0,
tls +compat -hans +network,
any.tls-session-manager ==0.0.4,
any.transformers ==0.5.6.2,
Expand Down Expand Up @@ -308,7 +314,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.wai-logger ==2.4.0,
any.warp ==3.3.28,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.warp-tls ==3.4.0,
any.warp-tls ==3.4.1,
any.what4 ==1.5,
what4 -drealtestdisable -solvertests -stptestdisable,
any.witherable ==0.4.2,
Expand All @@ -318,4 +324,4 @@ constraints: any.BoundedChan ==1.0.3.0,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2023-08-12T09:08:58Z
index-state: hackage.haskell.org 2023-08-30T21:35:34Z
Loading

0 comments on commit bd35c9b

Please sign in to comment.