Regenerate CI; hashable supports GHC 9.10 now

haskell-haskey · Apr 9, 2024 · cc2713b · cc2713b
1 parent e9d6f24
commit cc2713b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 26 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -1,16 +1,16 @@
 # This GitHub workflow config has been generated by a script via
 #
-# haskell-ci 'github' 'xxhash-ffi.cabal' '--apt' 'libxxhash-dev' '--distribution' 'jammy' '--ghcup-jobs' '--installed' '-filepath'
+# haskell-ci 'github' 'xxhash-ffi.cabal' '--apt' 'libxxhash-dev' '--distribution' 'jammy' '--ghcup-jobs' '--no-head-hackage'
 #
 # To regenerate the script (for example after adjusting tested-with) run
 #
 # haskell-ci regenerate
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240316
+# version: 0.19.20240402
 #
-# REGENDATA ("0.19.20240316",["github","xxhash-ffi.cabal","--apt","libxxhash-dev","--distribution","jammy","--ghcup-jobs","--installed","-filepath"])
+# REGENDATA ("0.19.20240402",["github","xxhash-ffi.cabal","--apt","libxxhash-dev","--distribution","jammy","--ghcup-jobs","--no-head-hackage"])
 #
 name: Haskell-CI
 on:
@@ -28,9 +28,9 @@ jobs:
  strategy:
  matrix:
  include:
- - compiler: ghc-9.10.0.20240313
+ - compiler: ghc-9.10.0.20240328
  compilerKind: ghc
- compilerVersion: 9.10.0.20240313
+ compilerVersion: 9.10.0.20240328
  setup-method: ghcup
  allow-failure: false
  - compiler: ghc-9.8.2
@@ -119,7 +119,7 @@ jobs:
  echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
  echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
  echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
- if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
  echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
  echo "GHCJSARITH=0" >> "$GITHUB_ENV"
  env:
@@ -148,18 +148,6 @@ jobs:
  repository hackage.haskell.org
  url: http://hackage.haskell.org/
  EOF
- if $HEADHACKAGE; then
- cat >> $CABAL_CONFIG <<EOF
- repository head.hackage.ghc.haskell.org
- url: https://ghc.gitlab.haskell.org/head.hackage/
- secure: True
- root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
- 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
- f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
- key-threshold: 3
- active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
- EOF
- fi
  cat >> $CABAL_CONFIG <<EOF
  program-default-options
  ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -211,11 +199,7 @@ jobs:
  echo " ghc-options: -Werror=missing-methods" >> cabal.project
  cat >> cabal.project <<EOF
  EOF
- if $HEADHACKAGE; then
- echo "constraints: filepath < 1.5" >> cabal.project
- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
- fi
- $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(filepath|xxhash-ffi)$/; }' >> cabal.project.local
+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(xxhash-ffi)$/; }' >> cabal.project.local
  cat cabal.project
  cat cabal.project.local
  - name: dump install plan

diff --git a/xxhash-ffi.cabal b/xxhash-ffi.cabal
@@ -95,6 +95,3 @@ benchmark xxhash-ffi-bench
  deepseq,
  digest,
  murmur-hash
-
- if impl(ghc <9.10)
- build-depends: hashable