diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b6ff8c0..743fced 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,6 +1,6 @@ # This GitHub workflow config has been generated by a script via # -# haskell-ci 'github' 'cabal.project' +# haskell-ci 'github' 'cabal.project' '--config' 'cabal.haskell-ci' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # version: 0.17.20240109 # -# REGENDATA ("0.17.20240109",["github","cabal.project"]) +# REGENDATA ("0.17.20240109",["github","cabal.project","--config","cabal.haskell-ci"]) # name: Haskell-CI on: @@ -48,6 +48,11 @@ jobs: compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false + - compiler: ghc-8.10.7 + compilerKind: ghc + compilerVersion: 8.10.7 + setup-method: ghcup + allow-failure: false fail-fast: false steps: - name: apt @@ -165,9 +170,9 @@ jobs: source-repository-package type: git location: https://github.com/FinleyMcIlwaine/bos-snappy - tag: 373be55746d8b3c75e6e8f0a4d1dfebf3e3ad649 + tag: b00b103a8c522aa3adde7e922537ab6b74f73eb0 EOF - $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(snappy-c)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(bytestring|snappy-c)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/cabal.haskell-ci b/cabal.haskell-ci index a72faa1..af56460 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1 +1,3 @@ apt: libsnappy-dev + +installed: -bytestring diff --git a/cabal.project b/cabal.project index c4d42b8..a441f78 100644 --- a/cabal.project +++ b/cabal.project @@ -3,4 +3,4 @@ packages: . source-repository-package type: git location: https://github.com/FinleyMcIlwaine/bos-snappy - tag: 373be55746d8b3c75e6e8f0a4d1dfebf3e3ad649 + tag: b00b103a8c522aa3adde7e922537ab6b74f73eb0 diff --git a/snappy-c.cabal b/snappy-c.cabal index 469e1b5..848daa2 100644 --- a/snappy-c.cabal +++ b/snappy-c.cabal @@ -17,7 +17,8 @@ category: Codec build-type: Simple extra-source-files: README.md extra-doc-files: CHANGELOG.md -tested-with: GHC==9.2.8 +tested-with: GHC==8.10.7 + , GHC==9.2.8 , GHC==9.4.8 , GHC==9.6.4 , GHC==9.8.1 @@ -33,7 +34,7 @@ common lang -Wprepositive-qualified-module -Widentities build-depends: - base >= 4.16 && < 4.20 + base >= 4.14 && < 4.20 default-language: Haskell2010 default-extensions: @@ -101,7 +102,6 @@ executable snappy-cli -threaded -rtsopts --- TODO bounds here test-suite test-snappy-c import: lang