From 1b9ec6d3aaf28ba40b6e8ebed1d846a64249e64d Mon Sep 17 00:00:00 2001 From: Dmitrii Kovanikov Date: Tue, 15 Feb 2022 13:44:03 +0000 Subject: [PATCH] [#117] Support GHC 9.2 Resolves #117 --- .github/dependabot.yml | 12 ++++++++++++ .github/workflows/ci.yml | 27 ++++++++++++++++++--------- CHANGELOG.md | 7 +++++++ src/Data/TMap.hs | 2 +- src/Data/TypeRepMap.hs | 2 +- src/Data/TypeRepMap/Internal.hs | 2 +- typerep-map.cabal | 17 +++++++++-------- 7 files changed, 49 insertions(+), 20 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..0ead586 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + commit-message: + prefix: "GA" + include: "scope" + labels: + - "CI" + - "dependencies" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7274b5a..b431726 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: CI on: + workflow_dispatch: pull_request: types: [synchronize, opened, reopened] push: @@ -9,7 +10,6 @@ on: # additionally run once per week (At 00:00 on Sunday) to maintain cache - cron: '0 0 * * 0' - jobs: cabal: name: ${{ matrix.os }} / ghc ${{ matrix.ghc }} @@ -17,17 +17,20 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - cabal: ["3.4"] + cabal: ["3.6.2.0"] ghc: - "8.2.2" - "8.4.4" - "8.6.5" - "8.8.4" - - "8.10.5" - - "9.0.1" + - "8.10.7" + - "9.0.2" + - "9.2.1" exclude: - os: macOS-latest - ghc: 8.10.5 + ghc: 9.0.2 + - os: macOS-latest + ghc: 8.10.7 - os: macOS-latest ghc: 8.8.4 - os: macOS-latest @@ -38,7 +41,9 @@ jobs: ghc: 8.2.2 - os: windows-latest - ghc: 8.10.5 + ghc: 9.0.2 + - os: windows-latest + ghc: 8.10.7 - os: windows-latest ghc: 8.8.4 - os: windows-latest @@ -49,9 +54,9 @@ jobs: ghc: 8.2.2 steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1.2.3 + - uses: haskell/actions/setup@v1.2 id: setup-haskell-cabal name: Setup Haskell with: @@ -66,7 +71,7 @@ jobs: run: | cabal freeze - - uses: actions/cache@v2.1.6 + - uses: actions/cache@v2 name: Cache ~/.cabal/store with: path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} @@ -83,3 +88,7 @@ jobs: - name: Test run: | cabal test all + + - name: Documentation + run: | + cabal haddock diff --git a/CHANGELOG.md b/CHANGELOG.md index 328fe91..4b78335 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ `typerep-map` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 0.5.0.0 — Feb 15, 2022 + +* [#117](https://github.com/kowainik/typerep-map/issues/117): + Support GHC-9.2 +* [#112](https://github.com/kowainik/typerep-map/issues/112): + Change `TypeRepMap` parameter role to `representational`. + ## 0.4.0.0 — Aug 3, 2021 * [#109](https://github.com/kowainik/typerep-map/issues/109): diff --git a/src/Data/TMap.hs b/src/Data/TMap.hs index 92be44a..8df20ea 100644 --- a/src/Data/TMap.hs +++ b/src/Data/TMap.hs @@ -3,7 +3,7 @@ {- | Module : Data.TMap -Copyright : (c) 2017-2021 Kowainik +Copyright : (c) 2017-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Data/TypeRepMap.hs b/src/Data/TypeRepMap.hs index 599aa8b..7dcb5ba 100644 --- a/src/Data/TypeRepMap.hs +++ b/src/Data/TypeRepMap.hs @@ -2,7 +2,7 @@ {- | Module : Data.TypeRepMap -Copyright : (c) 2017-2021 Kowainik +Copyright : (c) 2017-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Data/TypeRepMap/Internal.hs b/src/Data/TypeRepMap/Internal.hs index bd7e3a9..943094b 100644 --- a/src/Data/TypeRepMap/Internal.hs +++ b/src/Data/TypeRepMap/Internal.hs @@ -22,7 +22,7 @@ {- | Module : Data.TypeRepMap.Internal -Copyright : (c) 2017-2021 Kowainik +Copyright : (c) 2017-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/typerep-map.cabal b/typerep-map.cabal index 539a2bf..e65361c 100644 --- a/typerep-map.cabal +++ b/typerep-map.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: typerep-map -version: 0.4.0.0 +version: 0.5.0.0 synopsis: Efficient implementation of a dependent map with types as keys description: A dependent map from type representations to values of these types. @@ -23,7 +23,7 @@ license: MPL-2.0 license-file: LICENSE author: Veronika Romashkina, Vladislav Zavialov, Dmitrii Kovanikov maintainer: Kowainik -copyright: 2017-2021 Kowainik +copyright: 2017-2022 Kowainik category: Data, Data Structures, Types build-type: Simple extra-doc-files: README.md @@ -32,15 +32,16 @@ tested-with: GHC == 8.2.2 , GHC == 8.4.4 , GHC == 8.6.5 , GHC == 8.8.4 - , GHC == 8.10.5 - , GHC == 9.0.1 + , GHC == 8.10.7 + , GHC == 9.0.2 + , GHC == 9.2.1 source-repository head type: git location: https://github.com/kowainik/typerep-map.git common common-options - build-depends: base >= 4.10 && < 4.16 + build-depends: base >= 4.10 && < 4.17 default-language: Haskell2010 default-extensions: BangPatterns @@ -72,7 +73,7 @@ library Data.TypeRepMap Data.TypeRepMap.Internal - build-depends: ghc-prim >= 0.5.1.1 && < 0.8 + build-depends: ghc-prim >= 0.5.1.1 && < 0.9 , primitive ^>= 0.7.0 , deepseq ^>= 1.4 @@ -100,8 +101,8 @@ test-suite typerep-map-test , Test.TypeRep.VectorOpt build-depends: ghc-typelits-knownnat >= 0.4.2 && < 0.8 - , hedgehog ^>= 1.0 - , hspec >= 2.7.1 && < 2.9 + , hedgehog >= 1.0 && < 1.2 + , hspec >= 2.7.1 && < 2.10 , hspec-hedgehog ^>= 0.0.1 , typerep-map , typerep-extra-impls