Regenerate CI, test GHC 9.10.1

ekmett · Apr 20, 2024 · 6861cee · 6861cee
1 parent 38f397d
commit 6861cee
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 35 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.17.20230811
+# version: 0.19.20240416
 #
-# REGENDATA ("0.17.20230811",["--config=cabal.haskell-ci","cabal.project"])
+# REGENDATA ("0.19.20240416",["--config=cabal.haskell-ci","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -28,19 +28,24 @@ jobs:
  strategy:
  matrix:
  include:
- - compiler: ghc-9.8.0.20230809
+ - compiler: ghc-9.10.0.20240413
  compilerKind: ghc
- compilerVersion: 9.8.0.20230809
+ compilerVersion: 9.10.0.20240413
  setup-method: ghcup
- allow-failure: true
- - compiler: ghc-9.6.2
+ allow-failure: false
+ - compiler: ghc-9.8.2
+ compilerKind: ghc
+ compilerVersion: 9.8.2
+ setup-method: ghcup
+ allow-failure: false
+ - compiler: ghc-9.6.4
  compilerKind: ghc
- compilerVersion: 9.6.2
+ compilerVersion: 9.6.4
  setup-method: ghcup
  allow-failure: false
- - compiler: ghc-9.4.5
+ - compiler: ghc-9.4.8
  compilerKind: ghc
- compilerVersion: 9.4.5
+ compilerVersion: 9.4.8
  setup-method: ghcup
  allow-failure: false
  - compiler: ghc-9.2.8
@@ -90,11 +95,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.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
  apt-get update
  apt-get install -y freeglut3-dev
  env:
@@ -114,12 +119,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.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
+ 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:
@@ -176,7 +181,7 @@ jobs:
  - name: cache (tools)
  uses: actions/cache/restore@v3
  with:
- key: ${{ runner.os }}-${{ matrix.compiler }}-tools-d1961fb1
+ key: ${{ runner.os }}-${{ matrix.compiler }}-tools-d3d4cc06
  path: ~/.haskell-ci-tools
  - name: install cabal-plan
  run: |
@@ -190,23 +195,23 @@ jobs:
  - name: install cabal-docspec
  run: |
  mkdir -p $HOME/.cabal/bin
- curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20230517/cabal-docspec-0.0.0.20230517-x86_64-linux.xz > cabal-docspec.xz
- echo '3b31bbe463ad4d671abbc103db49628562ec48a6604cab278207b5b6acd21ed7 cabal-docspec.xz' | sha256sum -c -
+ curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
+ echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c -
  xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
  rm -f cabal-docspec.xz
  chmod a+x $HOME/.cabal/bin/cabal-docspec
  cabal-docspec --version
  - name: install hlint
  run: |
- if [ $((HCNUMVER >= 90600 && HCNUMVER < 90800)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint --constraint='hlint >=3.6 && <3.7' | perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
- if [ $((HCNUMVER >= 90600 && HCNUMVER < 90800)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
- if [ $((HCNUMVER >= 90600 && HCNUMVER < 90800)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
- if [ $((HCNUMVER >= 90600 && HCNUMVER < 90800)) -ne 0 ] ; then hlint --version ; fi
+ if [ $((HCNUMVER >= 90800 && HCNUMVER < 91000)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint --constraint='hlint >=3.8 && <3.9' | perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
+ if [ $((HCNUMVER >= 90800 && HCNUMVER < 91000)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
+ if [ $((HCNUMVER >= 90800 && HCNUMVER < 91000)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
+ if [ $((HCNUMVER >= 90800 && HCNUMVER < 91000)) -ne 0 ] ; then hlint --version ; fi
  - name: save cache (tools)
  uses: actions/cache/save@v3
  if: always()
  with:
- key: ${{ runner.os }}-${{ matrix.compiler }}-tools-d1961fb1
+ key: ${{ runner.os }}-${{ matrix.compiler }}-tools-d3d4cc06
  path: ~/.haskell-ci-tools
  - name: checkout
  uses: actions/checkout@v3
@@ -281,9 +286,9 @@ jobs:
  cabal-docspec $ARG_COMPILER
  - name: hlint
  run: |
- if [ $((HCNUMVER >= 90600 && HCNUMVER < 90800)) -ne 0 ] ; then (cd ${PKGDIR_lens} && hlint -XHaskell2010 src) ; fi
- if [ $((HCNUMVER >= 90600 && HCNUMVER < 90800)) -ne 0 ] ; then (cd ${PKGDIR_lens_examples} && hlint -XHaskell2010 .) ; fi
- if [ $((HCNUMVER >= 90600 && HCNUMVER < 90800)) -ne 0 ] ; then (cd ${PKGDIR_lens_properties} && hlint -XHaskell2010 src) ; fi
+ if [ $((HCNUMVER >= 90800 && HCNUMVER < 91000)) -ne 0 ] ; then (cd ${PKGDIR_lens} && hlint -XHaskell2010 src) ; fi
+ if [ $((HCNUMVER >= 90800 && HCNUMVER < 91000)) -ne 0 ] ; then (cd ${PKGDIR_lens_examples} && hlint -XHaskell2010 .) ; fi
+ if [ $((HCNUMVER >= 90800 && HCNUMVER < 91000)) -ne 0 ] ; then (cd ${PKGDIR_lens_properties} && hlint -XHaskell2010 src) ; fi
  - name: cabal check
  run: |
  cd ${PKGDIR_lens} || false

diff --git a/cabal.haskell-ci b/cabal.haskell-ci
@@ -2,7 +2,7 @@ distribution: jammy
 no-tests-no-benchmarks: False
 unconstrained: False
 hlint: True
-hlint-version: >=3.6 && <3.7
+hlint-version: >=3.8 && <3.9
 apt: freeglut3-dev
 -- irc-channels: irc.freenode.org#haskell-lens
 irc-if-in-origin-repo: True

diff --git a/examples/lens-examples.cabal b/examples/lens-examples.cabal
@@ -24,9 +24,10 @@ tested-with: GHC == 8.0.2
  , GHC == 8.10.7
  , GHC == 9.0.2
  , GHC == 9.2.8
- , GHC == 9.4.5
- , GHC == 9.6.2
- , GHC == 9.8.1
+ , GHC == 9.4.8
+ , GHC == 9.6.4
+ , GHC == 9.8.2
+ , GHC == 9.10.1
 
 source-repository head
  type: git

diff --git a/lens-properties/lens-properties.cabal b/lens-properties/lens-properties.cabal
@@ -21,9 +21,10 @@ tested-with: GHC == 8.0.2
  , GHC == 8.10.7
  , GHC == 9.0.2
  , GHC == 9.2.8
- , GHC == 9.4.5
- , GHC == 9.6.2
- , GHC == 9.8.1
+ , GHC == 9.4.8
+ , GHC == 9.6.4
+ , GHC == 9.8.2
+ , GHC == 9.10.1
 
 extra-source-files:
  .hlint.yaml

diff --git a/lens.cabal b/lens.cabal
@@ -20,9 +20,10 @@ tested-with: GHC == 8.0.2
  , GHC == 8.10.7
  , GHC == 9.0.2
  , GHC == 9.2.8
- , GHC == 9.4.5
- , GHC == 9.6.2
- , GHC == 9.8.1
+ , GHC == 9.4.8
+ , GHC == 9.6.4
+ , GHC == 9.8.2
+ , GHC == 9.10.1
 synopsis: Lenses, Folds and Traversals
 description:
  This package comes \"Batteries Included\" with many useful lenses for the types