diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index f551746b..e0721dd1 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.4.4', '9.2.7', '9.0.2', '8.10.7', '8.8.4', '8.6.5'] + ghc: ['9.6.1', '9.4.4', '9.2.7', '9.0.2', '8.10.7', '8.8.4', '8.6.5'] os: [ubuntu-latest, macOS-latest, windows-latest] steps: diff --git a/hie-bios.cabal b/hie-bios.cabal index ccad96b5..c98a7c7b 100644 --- a/hie-bios.cabal +++ b/hie-bios.cabal @@ -125,7 +125,7 @@ Extra-Source-Files: ChangeLog.md tests/projects/stack-with-yaml/stack-with-yaml.cabal tests/projects/stack-with-yaml/src/Lib.hs -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1 Library Default-Language: Haskell2010 diff --git a/tests/BiosTests.hs b/tests/BiosTests.hs index 896336df..c9910c27 100644 --- a/tests/BiosTests.hs +++ b/tests/BiosTests.hs @@ -306,7 +306,7 @@ stackYamlResolver = #if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,4,4,0))) "nightly-2023-03-13" -- GHC 9.4.4 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,2,7,0))) - "lts-20.14" -- GHC 9.2.7 + "lts-20.20" -- GHC 9.2.7 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,2,1,0))) "lts-20.11" -- GHC 9.2.5 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,0,1,0))) @@ -388,6 +388,8 @@ ignoreOnUnsupportedGhc :: TestTree -> TestTree ignoreOnUnsupportedGhc tt = #if (defined(MIN_VERSION_GLASGOW_HASKELL) && MIN_VERSION_GLASGOW_HASKELL(9,2,1,0) && !MIN_VERSION_GLASGOW_HASKELL(9,2,4,0)) ignoreTestBecause "Not supported on GHC >= 9.2.1 && < 9.2.4" +#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && MIN_VERSION_GLASGOW_HASKELL(9,6,0,0)) + ignoreTestBecause "No stackage snapshot for GHC 9.6 available, yet" #endif tt