Merge pull request #24 from haskellari/ghc-9.6

Allow base-4.18

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.15.20220808
+# version: 0.15.20230313
 #
-# REGENDATA ("0.15.20220808",["github","cabal.project"])
+# REGENDATA ("0.15.20230313",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -32,14 +32,19 @@ jobs:
  strategy:
  matrix:
  include:
- - compiler: ghc-9.4.1
+ - compiler: ghc-9.6.1
  compilerKind: ghc
- compilerVersion: 9.4.1
+ compilerVersion: 9.6.1
  setup-method: ghcup
  allow-failure: false
- - compiler: ghc-9.2.4
+ - compiler: ghc-9.4.4
  compilerKind: ghc
- compilerVersion: 9.2.4
+ compilerVersion: 9.4.4
+ setup-method: ghcup
+ allow-failure: false
+ - compiler: ghc-9.2.7
+ compilerKind: ghc
+ compilerVersion: 9.2.7
  setup-method: ghcup
  allow-failure: false
  - compiler: ghc-9.0.2
@@ -103,15 +108,15 @@ jobs:
  curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
  chmod a+x "$HOME/.ghcup/bin/ghcup"
  "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
- "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
  else
  apt-add-repository -y 'ppa:hvr/ghc'
  apt-get update
  apt-get install -y "$HCNAME"
  mkdir -p "$HOME/.ghcup/bin"
  curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
  chmod a+x "$HOME/.ghcup/bin/ghcup"
- "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
  fi
  env:
  HCKIND: ${{ matrix.compilerKind }}
@@ -129,13 +134,13 @@ jobs:
  echo "HC=$HC" >> "$GITHUB_ENV"
  echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
  echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
- echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
  else
  HC=$HCDIR/bin/$HCKIND
  echo "HC=$HC" >> "$GITHUB_ENV"
  echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
  echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
- echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
  fi
 
  HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -194,7 +199,7 @@ jobs:
  chmod a+x $HOME/.cabal/bin/cabal-plan
  cabal-plan --version
  - name: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  path: source
  - name: initial cabal.project for sdist
@@ -229,8 +234,8 @@ jobs:
  run: |
  $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
  cabal-plan
- - name: cache
- uses: actions/cache@v2
+ - name: restore cache
+ uses: actions/cache/restore@v3
  with:
  key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
  path: ~/.cabal/store
@@ -254,8 +259,14 @@ jobs:
  ${CABAL} -vnormal check
  - name: haddock
  run: |
- $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+ $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
  - name: unconstrained build
  run: |
  rm -f cabal.project.local
  $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
+ - name: save cache
+ uses: actions/cache/save@v3
+ if: always()
+ with:
+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+ path: ~/.cabal/store

binary-instances.cabal

@@ -1,5 +1,6 @@
 name: binary-instances
 version: 1.0.4
+x-revision: 1
 synopsis: Orphan instances for binary
 description:
  `binary-instances` defines orphan instances for types in some popular packages.
@@ -26,6 +27,7 @@ tested-with:
  || ==9.0.2
  || ==9.2.7
  || ==9.4.4
+ || ==9.6.1
 
 extra-source-files: CHANGELOG.md
 
@@ -38,7 +40,7 @@ library
  hs-source-dirs: src
  build-depends:
  aeson >=0.7.0.6 && <1.6 || >=2.0.0.0 && <2.2
- , base >=4.6.0.1 && <4.18
+ , base >=4.6.0.1 && <4.19
  , binary >=0.5.1.1 && <0.8.10
  , binary-orphans >=1.0.4 && <1.1
  , case-insensitive >=1.2.0.4 && <1.2.2