Merge pull request #67 from haskellari/ghc-9.0

Allow base-4.15

Author: phadej

.github/workflows/haskell-ci.yml

@@ -1,16 +1,16 @@
 # This GitHub workflow config has been generated by a script via
 #
-# haskell-ci 'github' 'postgresql-simple.cabal'
+# haskell-ci 'github' 'cabal.project'
 #
 # 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.11.20210101
+# version: 0.11.20210220
 #
-# REGENDATA ("0.11.20210101",["github","postgresql-simple.cabal"])
+# REGENDATA ("0.11.20210220",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -22,7 +22,7 @@ on:
  - master
 jobs:
  linux:
- name: Haskell-CI Linux - GHC ${{ matrix.ghc }}
+ name: Haskell-CI - Linux - GHC ${{ matrix.ghc }}
  runs-on: ubuntu-18.04
  container:
  image: buildpack-deps:bionic
@@ -36,7 +36,9 @@ jobs:
  strategy:
  matrix:
  include:
- - ghc: 8.10.3
+ - ghc: 9.0.1
+ allow-failure: false
+ - ghc: 8.10.4
  allow-failure: false
  - ghc: 8.8.4
  allow-failure: false
@@ -62,7 +64,7 @@ jobs:
  apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
  apt-add-repository -y 'ppa:hvr/ghc'
  apt-get update
- apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
+ apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
  env:
  GHC_VERSION: ${{ matrix.ghc }}
  - name: Set PATH and environment variables
@@ -75,12 +77,13 @@ jobs:
  echo "HC=$HC" >> $GITHUB_ENV
  echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
  echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
- echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
+ echo "CABAL=/opt/cabal/3.4/bin/cabal -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 "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
+ echo "HEADHACKAGE=false" >> $GITHUB_ENV
+ echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
  echo "GHCJSARITH=0" >> $GITHUB_ENV
  env:
  GHC_VERSION: ${{ matrix.ghc }}
@@ -128,10 +131,14 @@ jobs:
  uses: actions/checkout@v2
  with:
  path: source
+ - name: initial cabal.project for sdist
+ run: |
+ touch cabal.project
+ echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
+ cat cabal.project
  - name: sdist
  run: |
  mkdir -p sdist
- cd source || false
  $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
  - name: unpack
  run: |
@@ -147,6 +154,7 @@ jobs:
  if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package postgresql-simple" >> cabal.project ; fi
  if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
  cat >> cabal.project <<EOF
+ allow-newer: cryptohash-md5-0.11.100.1:base
  EOF
  $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(postgresql-simple)$/; }' >> cabal.project.local
  cat cabal.project

cabal.project

@@ -1,2 +1,4 @@
 packages: .
 tests: true
+
+allow-newer: cryptohash-md5-0.11.100.1:base

postgresql-simple.cabal

@@ -31,7 +31,8 @@ tested-with:
  || ==8.4.4
  || ==8.6.5
  || ==8.8.4
- || ==8.10.3
+ || ==8.10.4
+ || ==9.0.1
 
 library
  default-language: Haskell2010
@@ -77,10 +78,10 @@ library
 
  -- GHC bundled libs
  build-depends:
- base >=4.6.0.0 && <4.15
+ base >=4.6.0.0 && <4.16
  , bytestring >=0.10.0.0 && <0.12
  , containers >=0.5.0.0 && <0.7
- , template-haskell >=2.8.0.0 && <2.17
+ , template-haskell >=2.8.0.0 && <2.18
  , text >=1.2.3.0 && <1.3
  , time-compat >=1.9.5 && <1.12
  , transformers >=0.3.0.0 && <0.6