Use Stack 2.7.5, cleanup

haskell-servant · Mar 9, 2022 · bbd82a7 · bbd82a7
1 parent de923fc
commit bbd82a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -58,9 +58,6 @@ jobs:
         cabal test all
 
     - name: Run doctests
-      # doctests are broken on GHC 9 due to compiler bug:
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/19460
-      continue-on-error: ${{ matrix.ghc == '9.0.1' }}
       run: |
         # Necessary for doctest to be found in $PATH
         export PATH="$HOME/.cabal/bin:$PATH"
@@ -82,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        stack: ["2.7.3"]
+        stack: ["2.7.5"]
         ghc: ["8.10.7"]
 
     steps:

diff --git a/cabal.project b/cabal.project
@@ -51,7 +51,3 @@ packages:
 tests: True
 optimization: False
 -- reorder-goals: True
-
--- https://github.com/chordify/haskell-servant-pagination/pull/12
-allow-newer: servant-pagination-2.2.2:servant
-allow-newer: servant-pagination-2.2.2:servant-server