Skip to content

Commit

Permalink
Add support for GHC 9.10. (#201)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanknowles authored May 19, 2024
2 parents 4be791e + 9b08366 commit 8b65d7e
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
- '9.4'
- '9.6'
- '9.8'
- '9.10'
exclude:
# TODO: https://github.com/haskell-actions/setup/issues/77
# To work around the above issue, we exclude the following versions:
Expand Down Expand Up @@ -115,7 +116,7 @@ jobs:
if: |
github.ref == 'refs/heads/main'
&& matrix.os == 'ubuntu-latest'
&& matrix.ghc == '9.8'
&& matrix.ghc == '9.10'
run: >
mv ${{ env.cabal-build-dir }}/build/*/*/*/doc/html/* gh-pages
Expand All @@ -125,7 +126,7 @@ jobs:
if: |
github.ref == 'refs/heads/main'
&& matrix.os == 'ubuntu-latest'
&& matrix.ghc == '9.8'
&& matrix.ghc == '9.10'
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.0.1.4

- Added support for GHC 9.10.

# 0.0.1.3

- Updated version bounds for dependencies.
Expand Down
4 changes: 2 additions & 2 deletions monoidmap.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: monoidmap
version: 0.0.1.3
version: 0.0.1.4
bug-reports: https://github.com/jonathanknowles/monoidmap/issues
license: Apache-2.0
license-file: LICENSE
Expand All @@ -17,7 +17,7 @@ extra-doc-files:
README.md

common dependency-base
build-depends:base >= 4.14.3.0 && < 4.20
build-depends:base >= 4.14.3.0 && < 4.21
common dependency-containers
build-depends:containers >= 0.6.5.1 && < 0.8
common dependency-deepseq
Expand Down
21 changes: 15 additions & 6 deletions src/benchmark/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,28 @@

module Main where

import Prelude hiding
( lookup )

import Control.DeepSeq
( rnf )
import Control.Exception
( evaluate )
import Data.Eq
( Eq )
import Data.Function
( flip, ($) )
import Data.Int
( Int )
import Data.List
( foldl' )
( foldl', zip )
import Data.Maybe
( fromMaybe )
( Maybe, fromMaybe )
import Data.Ord
( Ord )
import Data.Semigroup
( stimes )
( Semigroup ((<>)), stimes )
import Prelude
( Integer, Num, (^) )
import System.IO
( IO )
import Test.Tasty.Bench
( bench, bgroup, defaultMain, nf )

Expand Down
4 changes: 2 additions & 2 deletions src/test/Data/MonoidMap/ClassSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import GHC.Exts
( IsList (..) )
import Numeric.Natural
( Natural )
import Test.Hspec
( Spec, describe )
import Test.Combinators.NonZero
( NonZero, genNonZero, shrinkNonZero )
import Test.Hspec
( Spec, describe )
import Test.QuickCheck
( Arbitrary (..), listOf, scale, shrinkMapBy )
import Test.QuickCheck.Classes
Expand Down

0 comments on commit 8b65d7e

Please sign in to comment.