Skip to content

Commit

Permalink
Merge branch 'master' into semigroupoid-instances
Browse files Browse the repository at this point in the history
  • Loading branch information
@ali-abrar
ali-abrar authored May 28, 2024
2 parents e2ab67a + cb2d1f9 commit c6f89aa
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 16 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/haskell-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.8.1
compilerKind: ghc
compilerVersion: 9.8.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.1
compilerKind: ghc
compilerVersion: 9.4.1
Expand Down Expand Up @@ -79,15 +89,15 @@ jobs:
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
else
apt-add-repository -y 'ppa:hvr/ghc'
apt-get update
apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi
env:
HCKIND: ${{ matrix.compilerKind }}
Expand All @@ -105,13 +115,13 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
else
HC=$HCDIR/bin/$HCKIND
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
fi
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
Expand Down
10 changes: 10 additions & 0 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
# Unreleased
* Add `Apply`/`Bind`/`Alt`/`Plus` instances to `MonoidalMap`/`MonoidalHashMap`/`MonoidalIntMap`

# 0.6.4.0

* [Bump upper bound of `these`](https://github.com/bgamari/monoidal-containers/pull/95)
* [Bump upper bound of `semialign`](https://github.com/bgamari/monoidal-containers/pull/96)
* [Build with GHC 9.6](https://github.com/bgamari/monoidal-containers/pull/97)

# 0.6.3.0

* [Bump upper bounds of aeson, base, and lens](https://github.com/bgamari/monoidal-containers/pull/92)

# 0.6.2.0

* [Remove cyclic definition of `!?`](https://github.com/bgamari/monoidal-containers/pull/88)
Expand Down
16 changes: 8 additions & 8 deletions monoidal-containers.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: monoidal-containers
version: 0.6.2.0
version: 0.6.4.0
synopsis: Containers with monoidal accumulation
description:
Containers with merging via monoidal accumulation. The 'Monoid' instances
Expand Down Expand Up @@ -53,21 +53,21 @@ library
MultiParamTypeClasses

build-depends:
aeson >=1.0 && <2.2
, base >=4.7 && <4.18
, containers >=0.5.9 && <0.7
, deepseq >=1.3 && <1.5
aeson >=1.0 && <2.3
, base >=4.7 && <4.20
, containers >=0.5.9 && <0.8
, deepseq >=1.3 && <1.6
, hashable >=1.2 && <1.5
, lens >=4.4 && <5.3
, lens >=4.4 && <5.4
, newtype >=0.2 && <0.3
, semigroupoids >=4.0 && <5.4
, unordered-containers >=0.2 && <0.3
, witherable >=0.4 && <0.5

if flag(split-these)
build-depends:
semialign >=1 && <1.3
, these >=1 && <1.2
semialign >=1 && <1.4
, these >=1 && <1.3

else
build-depends: these >=0.7 && <0.9
Expand Down
2 changes: 1 addition & 1 deletion src/Data/IntMap/Monoidal.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ module Data.IntMap.Monoidal
-- , showTreeWith
) where

import Prelude hiding (null, lookup, map, foldl, foldr, filter)
import Prelude hiding (Foldable(..), lookup, map, filter)

import Data.Coerce (coerce)
import Data.IntSet (IntSet)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/IntMap/Monoidal/Strict.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ module Data.IntMap.Monoidal.Strict
-- , showTreeWith
) where

import Prelude hiding (null, lookup, map, foldl, foldr, filter)
import Prelude hiding (Foldable(..), lookup, map, filter)

import Data.Coerce (coerce)
import Data.IntSet (IntSet)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Map/Monoidal.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ module Data.Map.Monoidal
-- , showTreeWith
) where

import Prelude hiding (null, lookup, map, foldl, foldr, filter, take, drop, splitAt)
import Prelude hiding (Foldable(..), lookup, map, filter, take, drop, splitAt)

import Data.Coerce (coerce)
import Data.Set (Set)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Map/Monoidal/Strict.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ module Data.Map.Monoidal.Strict
-- , showTreeWith
) where

import Prelude hiding (null, lookup, map, foldl, foldr, filter, take, drop, splitAt)
import Prelude hiding (Foldable(..), lookup, map, filter, take, drop, splitAt)

import Data.Coerce (coerce)
import Data.Set (Set)
Expand Down

0 comments on commit c6f89aa

Please sign in to comment.