Merge pull request #159 from haskell/lehins/update-ghc-on-ci

Update CI to use newer GHC versions and LTS-22
haskell · Jan 27, 2024 · f3348d2 · f3348d2
2 parents 74146bd + a87b1c0
commit f3348d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -30,8 +30,8 @@ jobs:
           - { os: ubuntu-latest,  ghc: "8.10.7" }
           - { os: ubuntu-latest,  ghc: "9.0.2"  }
           - { os: ubuntu-latest,  ghc: "9.2.8"  }
-          - { os: ubuntu-latest,  ghc: "9.4.7"  }
-          - { os: ubuntu-latest,  ghc: "9.6.3"  }
+          - { os: ubuntu-latest,  ghc: "9.4.8"  }
+          - { os: ubuntu-latest,  ghc: "9.6.4"  }
           - { os: ubuntu-latest,  ghc: "9.8.1"  }
           # MacOS
           - { os: macOS-latest,  ghc: "8.0.2"  }
@@ -42,8 +42,8 @@ jobs:
           - { os: macOS-latest,  ghc: "8.10.7" }
           - { os: macOS-latest,  ghc: "9.0.2"  }
           - { os: macOS-latest,  ghc: "9.2.8"  }
-          - { os: macOS-latest,  ghc: "9.4.7"  }
-          - { os: macOS-latest,  ghc: "9.6.3"  }
+          - { os: macOS-latest,  ghc: "9.4.8"  }
+          - { os: macOS-latest,  ghc: "9.6.4"  }
           - { os: macOS-latest,  ghc: "9.8.1"  }
           # Windows
           - { os: windows-latest,  ghc: "8.0.2"  }
@@ -54,8 +54,8 @@ jobs:
           - { os: windows-latest,  ghc: "8.10.7" }
           - { os: windows-latest,  ghc: "9.0.2"  }
           - { os: windows-latest,  ghc: "9.2.8"  }
-          - { os: windows-latest,  ghc: "9.4.7"  }
-          - { os: windows-latest,  ghc: "9.6.3"  }
+          - { os: windows-latest,  ghc: "9.4.8"  }
+          - { os: windows-latest,  ghc: "9.6.4"  }
           - { os: windows-latest,  ghc: "9.8.1"  }
     steps:
     - uses: actions/checkout@v3
@@ -92,7 +92,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        resolver: [nightly, lts-21, lts-20, lts-19, lts-18, lts-16, lts-14, lts-12, lts-11]
+        resolver: [nightly, lts-22, lts-21, lts-20, lts-19, lts-18, lts-16, lts-14, lts-12, lts-11]
         include:
           - resolver: lts-11
             ghc: '8.2.2'
@@ -116,7 +116,10 @@ jobs:
             ghc: '9.2.8'
             stack-yaml: stack.yaml
           - resolver: lts-21
-            ghc: '9.4.7'
+            ghc: '9.4.8'
+            stack-yaml: stack.yaml
+          - resolver: lts-22
+            ghc: '9.6.4'
             stack-yaml: stack.yaml
           - resolver: nightly
             stack-yaml: stack.yaml

diff --git a/random.cabal b/random.cabal
@@ -71,8 +71,8 @@ tested-with:         GHC == 8.0.2
                    , GHC == 8.10.7
                    , GHC == 9.0.2
                    , GHC == 9.2.8
-                   , GHC == 9.4.7
-                   , GHC == 9.6.3
+                   , GHC == 9.4.8
+                   , GHC == 9.6.4
                    , GHC == 9.8.1
 
 source-repository head

diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-21.17
+resolver: lts-21.25
 packages:
 - .
 extra-deps: []