Revert GHC9.10.1 changes

bellroy · Oct 15, 2024 · 95c8cea · 95c8cea
1 parent 236838a
commit 95c8cea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -20,19 +20,13 @@ jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
     runs-on: ubuntu-20.04
-    timeout-minutes:
-      60
+    timeout-minutes: 60
     container:
       image: buildpack-deps:jammy
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.10.1
-            compilerKind: ghc
-            compilerVersion: 9.10.1
-            setup-method: ghcup
-            allow-failure: false
           - compiler: ghc-9.8.2
             compilerKind: ghc
             compilerVersion: 9.8.2

diff --git a/flake.nix b/flake.nix
@@ -13,7 +13,6 @@
         "ghc94"
         "ghc96"
         "ghc98"
-        "ghc910"
       ];
       defaultCompiler = "ghc96";
     };

diff --git a/servant-activeresource.cabal b/servant-activeresource.cabal
@@ -24,13 +24,7 @@ extra-doc-files:
   README.md
 
 tested-with:
-  GHC ==8.10.7
-   || ==9.0.2
-   || ==9.2.4
-   || ==9.4.5
-   || ==9.6.6
-   || ==9.8.2
-   || ==9.10.1
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.5 || ==9.6.6 || ==9.8.2
 
 source-repository head
   type:     git
@@ -48,7 +42,7 @@ common opts
 common deps
   build-depends:
     , aeson             ^>=2.1.1.0 || ^>=2.2
-    , base              >=4.14     && <4.21
+    , base              >=4.14     && <4.20
     , bytestring        >=0.10.12  && <0.13
     , containers        ^>=0.6     || ^>=0.7
     , servant           >=0.19     && <0.21
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ @@
             "ghc94"
             "ghc96"
             "ghc98"
-            "ghc910"
           ];
           defaultCompiler = "ghc96";
         };
@@ Expand Down @@