Bump CI to GHC 9.8.1

Author: andreasabel

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20231002
+# version: 0.17.20231012
 #
-# REGENDATA ("0.17.20231002",["github","cassava.cabal"])
+# REGENDATA ("0.17.20231012",["github","cassava.cabal"])
 #
 name: Haskell-CI
 on:
@@ -32,11 +32,11 @@ jobs:
  strategy:
  matrix:
  include:
- - compiler: ghc-9.8.0.20230929
+ - compiler: ghc-9.8.1
  compilerKind: ghc
- compilerVersion: 9.8.0.20230929
+ compilerVersion: 9.8.1
  setup-method: ghcup
- allow-failure: true
+ allow-failure: false
  - compiler: ghc-9.6.3
  compilerKind: ghc
  compilerVersion: 9.6.3
@@ -65,56 +65,40 @@ jobs:
  - compiler: ghc-8.8.4
  compilerKind: ghc
  compilerVersion: 8.8.4
- setup-method: hvr-ppa
+ setup-method: ghcup
  allow-failure: false
  - compiler: ghc-8.6.5
  compilerKind: ghc
  compilerVersion: 8.6.5
- setup-method: hvr-ppa
+ setup-method: ghcup
  allow-failure: false
  - compiler: ghc-8.4.4
  compilerKind: ghc
  compilerVersion: 8.4.4
- setup-method: hvr-ppa
+ setup-method: ghcup
  allow-failure: false
  - compiler: ghc-8.2.2
  compilerKind: ghc
  compilerVersion: 8.2.2
- setup-method: hvr-ppa
+ setup-method: ghcup
  allow-failure: false
  - compiler: ghc-8.0.2
  compilerKind: ghc
  compilerVersion: 8.0.2
- setup-method: hvr-ppa
- allow-failure: false
- - compiler: ghc-7.10.3
- compilerKind: ghc
- compilerVersion: 7.10.3
- setup-method: hvr-ppa
+ setup-method: ghcup
  allow-failure: false
  fail-fast: false
  steps:
  - name: apt
  run: |
  apt-get update
- apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
- if [ "${{ matrix.setup-method }}" = ghcup ]; then
- 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"
- 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" install ghc "$HCVER" || (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.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
- fi
+ 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"
+ 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" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
  env:
  HCKIND: ${{ matrix.compilerKind }}
  HCNAME: ${{ matrix.compiler }}
@@ -126,27 +110,18 @@ jobs:
  echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
  echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
  HCDIR=/opt/$HCKIND/$HCVER
- if [ "${{ matrix.setup-method }}" = ghcup ]; then
- HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
- HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
- HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
- 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"
- 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.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- fi
-
+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
+ 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"
  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"
- if [ $((HCNUMVER >= 90800)) -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:
@@ -175,18 +150,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
@@ -240,9 +203,6 @@ jobs:
  allow-newer: text
  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 /^(cassava)$/; }' >> cabal.project.local
  cat cabal.project
  cat cabal.project.local

cassava.cabal

@@ -44,7 +44,7 @@ Extra-source-files: examples/*.hs,
  CHANGES.md,
  README.md
 Tested-with:
- GHC == 9.8.0
+ GHC == 9.8.1
  GHC == 9.6.3
  GHC == 9.4.7
  GHC == 9.2.8
@@ -55,7 +55,7 @@ Tested-with:
  GHC == 8.4.4
  GHC == 8.2.2
  GHC == 8.0.2
- GHC == 7.10.3
+ -- GHC == 7.10.3
  -- GHC == 7.8.4
  -- GHC == 7.6.3
  -- GHC == 7.4.2