From 11d1fdb061c5be3c4f4432d3e667d8123f3b5893 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Mon, 13 Mar 2023 09:08:16 +0100 Subject: [PATCH] Test with GHC 9.2.7 and 9.6.1 (#147) --- .github/workflows/haskell-ci.yml | 34 +++++++------------------ effectful-core/effectful-core.cabal | 2 +- effectful-plugin/effectful-plugin.cabal | 2 +- effectful-th/effectful-th.cabal | 2 +- effectful/effectful.cabal | 2 +- 5 files changed, 13 insertions(+), 29 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 956a044..98306df 100644 --- 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.15.20230304 +# version: 0.15.20230312 # -# REGENDATA ("0.15.20230304",["github","--config=cabal.haskell-ci","cabal.project"]) +# REGENDATA ("0.15.20230312",["github","--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -32,19 +32,19 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.6.0.20230302 + - compiler: ghc-9.6.1 compilerKind: ghc - compilerVersion: 9.6.0.20230302 + compilerVersion: 9.6.1 setup-method: ghcup - allow-failure: true + allow-failure: false - compiler: ghc-9.4.4 compilerKind: ghc compilerVersion: 9.4.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.6 + - compiler: ghc-9.2.7 compilerKind: ghc - compilerVersion: 9.2.6 + compilerVersion: 9.2.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -71,9 +71,8 @@ jobs: 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" 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.9.0.0 || (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 }} @@ -89,7 +88,7 @@ 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.9.0.0 -vnormal+nowrap" >> "$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" @@ -123,18 +122,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> $CABAL_CONFIG <> cabal.project - fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(effectful|effectful-core|effectful-plugin|effectful-th)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/effectful-core/effectful-core.cabal b/effectful-core/effectful-core.cabal index b05979a..af9dd71 100644 --- a/effectful-core/effectful-core.cabal +++ b/effectful-core/effectful-core.cabal @@ -21,7 +21,7 @@ extra-source-files: CHANGELOG.md README.md -tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.6 || ==9.4.4 || ==9.6.1 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1 bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head diff --git a/effectful-plugin/effectful-plugin.cabal b/effectful-plugin/effectful-plugin.cabal index 729947c..c59585b 100644 --- a/effectful-plugin/effectful-plugin.cabal +++ b/effectful-plugin/effectful-plugin.cabal @@ -17,7 +17,7 @@ description: extra-source-files: CHANGELOG.md README.md -tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.6 || ==9.4.4 || ==9.6.1 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1 bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head diff --git a/effectful-th/effectful-th.cabal b/effectful-th/effectful-th.cabal index 1c8b961..86f57e5 100644 --- a/effectful-th/effectful-th.cabal +++ b/effectful-th/effectful-th.cabal @@ -17,7 +17,7 @@ extra-source-files: CHANGELOG.md README.md -tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.6 || ==9.4.4 || ==9.6.1 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1 bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head diff --git a/effectful/effectful.cabal b/effectful/effectful.cabal index 9a7b9ba..2c2c42e 100644 --- a/effectful/effectful.cabal +++ b/effectful/effectful.cabal @@ -22,7 +22,7 @@ extra-source-files: CHANGELOG.md README.md -tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.6 || ==9.4.4 || ==9.6.1 +tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1 bug-reports: https://github.com/haskell-effectful/effectful/issues source-repository head