Allow base-4.20, bump CI to GHC 9.10

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20231012
+# version: 0.18.1.20240316
 #
-# REGENDATA ("0.17.20231012",["github","hsc2hs.cabal"])
+# REGENDATA ("0.18.1.20240316",["github","hsc2hs.cabal"])
 #
 name: Haskell-CI
 on:
@@ -32,19 +32,24 @@ jobs:
  strategy:
  matrix:
  include:
- - compiler: ghc-9.8.1
+ - compiler: ghc-9.10.0.20240313
  compilerKind: ghc
- compilerVersion: 9.8.1
+ compilerVersion: 9.10.0.20240313
  setup-method: ghcup
  allow-failure: false
- - compiler: ghc-9.6.3
+ - compiler: ghc-9.8.2
  compilerKind: ghc
- compilerVersion: 9.6.3
+ compilerVersion: 9.8.2
  setup-method: ghcup
  allow-failure: false
- - compiler: ghc-9.4.7
+ - compiler: ghc-9.6.4
  compilerKind: ghc
- compilerVersion: 9.4.7
+ compilerVersion: 9.6.4
+ setup-method: ghcup
+ allow-failure: false
+ - compiler: ghc-9.4.8
+ compilerKind: ghc
+ compilerVersion: 9.4.8
  setup-method: ghcup
  allow-failure: false
  - compiler: ghc-9.2.8
@@ -94,11 +99,11 @@ jobs:
  apt-get update
  apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
  mkdir -p "$HOME/.ghcup/bin"
- curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
  chmod a+x "$HOME/.ghcup/bin/ghcup"
- "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
  "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
- "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
  env:
  HCKIND: ${{ matrix.compilerKind }}
  HCNAME: ${{ matrix.compiler }}
@@ -116,12 +121,12 @@ jobs:
  echo "HC=$HC" >> "$GITHUB_ENV"
  echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
  echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
- echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV"
  HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
  echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
  echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
  echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
- echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
+ if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
  echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
  echo "GHCJSARITH=0" >> "$GITHUB_ENV"
  env:
@@ -150,6 +155,18 @@ 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
@@ -202,6 +219,9 @@ jobs:
  cat >> cabal.project <<EOF
  allow-newer: containers
  EOF
+ if $HEADHACKAGE; then
+ 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 /^(hsc2hs)$/; }' >> cabal.project.local
  cat cabal.project
  cat cabal.project.local
@@ -210,7 +230,7 @@ jobs:
  $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
  cabal-plan
  - name: restore cache
- uses: actions/cache/restore@v3
+ uses: actions/cache/restore@v4
  with:
  key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
  path: ~/.cabal/store
@@ -250,7 +270,7 @@ jobs:
  if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi
  if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi
  - name: save cache
- uses: actions/cache/save@v3
+ uses: actions/cache/save@v4
  if: always()
  with:
  key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

hsc2hs.cabal

@@ -1,6 +1,7 @@
 cabal-version: >=1.10
 Name: hsc2hs
 Version: 0.68.10
+x-revision: 2
 
 Copyright: 2000, Marcin Kowalczyk
 License: BSD3
@@ -27,9 +28,10 @@ Data-Files: template-hsc.h
 build-type: Simple
 
 tested-with:
- GHC == 9.8.1
- GHC == 9.6.3
- GHC == 9.4.7
+ GHC == 9.10.0
+ GHC == 9.8.2
+ GHC == 9.6.4
+ GHC == 9.4.8
  GHC == 9.2.8
  GHC == 9.0.2
  GHC == 8.10.7
@@ -80,7 +82,7 @@ Executable hsc2hs
 
  Other-Extensions: CPP, NoMonomorphismRestriction
 
- Build-Depends: base >= 4.3.0 && < 4.20,
+ Build-Depends: base >= 4.3.0 && < 4.21,
  containers >= 0.4.0 && < 0.8,
  directory >= 1.1.0 && < 1.4,
  filepath >= 1.2.0 && < 1.6,