From 0f69215fc85241ba30da314966dd2371d65540e5 Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Sat, 19 Nov 2022 07:11:08 +0100 Subject: [PATCH] ci: Update to GHC 9.2.5 + A new stackage LTS is out with GHC 9.2.5, so test for this. + Update the haskell-ci jobs accordingly from 9.2.4. --- .github/workflows/haskell-ci.yml | 8 ++++---- .github/workflows/stack.yml | 4 +++- xmonad-contrib.cabal | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 6f408d30..1f3cce25 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.20221009 +# version: 0.15.202211107 # -# REGENDATA ("0.15.20221009",["github","cabal.project"]) +# REGENDATA ("0.15.202211107",["github","cabal.project"]) # name: Haskell-CI on: @@ -40,9 +40,9 @@ jobs: compilerVersion: 9.4.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.4 + - compiler: ghc-9.2.5 compilerKind: ghc - compilerVersion: 9.2.4 + compilerVersion: 9.2.5 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index 7c685e6a..797ebf61 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -23,8 +23,10 @@ jobs: - resolver: lts-18 # GHC 8.10 yaml: stack-master.yaml - resolver: lts-19 # GHC 9.0 + yaml: stack-master.yaml + - resolver: lts-20 # GHC 9.2 yaml: stack.yaml - - resolver: lts-19 # GHC 9.0 + - resolver: lts-20 # GHC 9.2 yaml: stack-master.yaml steps: diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 7b49cf6a..00f40fa2 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -38,7 +38,7 @@ cabal-version: 1.12 build-type: Simple bug-reports: https://github.com/xmonad/xmonad-contrib/issues -tested-with: GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.4 || == 9.4.2 +tested-with: GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.5 || == 9.4.2 source-repository head type: git