git.iko.soy/patch
on develop help sign in
Merge remote-tracking branch 'origin/develop' into no-group
commita9a9af4c5ce57ea8d94a6c076623e0ac3d21a985 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateTue 20 Apr 2021, 18:12 (5 years ago) parent57bdb2568cf321
4 files changed+53−3
compare with develop
unifiedsplit
.github/workflows/haskell.yml+45 ChangeLog.md+4 patch.cabal+3−2 src/Data/Patch/Class.hs+1−1
.github/workflows/haskell.ymlnew file+45
@@ -0,0 +1,45 @@
1+name: github-action
2+
3+on: [push, pull_request]
4+
5+jobs:
6+ build:
7+ strategy:
8+ matrix:
9+ ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.2']
10+ os: ['ubuntu-latest', 'macos-latest']
11+ exclude:
12+ # There are some linker warnings in 802 on darwin that
13+ # cause compilation to fail
14+ # See https://github.com/NixOS/nixpkgs/issues/25139
15+ - ghc: '8.0.2'
16+ os: 'macos-latest'
17+ runs-on: ${{ matrix.os }}
18+
19+ name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
20+ steps:
21+ - uses: actions/checkout@v2
22+ - uses: actions/setup-haskell@v1
23+ with:
24+ ghc-version: ${{ matrix.ghc }}
25+ - name: Cache
26+ uses: actions/cache@v1
27+ env:
28+ cache-name: cache-cabal
29+ with:
30+ path: ~/.cabal
31+ key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
32+ restore-keys: |
33+ ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
34+ ${{ runner.os }}-${{ matrix.ghc }}-build-
35+ ${{ runner.os }}-${{ matrix.ghc }}-
36+ ${{ runner.os }}
37+
38+ - name: Install dependencies
39+ run: |
40+ cabal update
41+ cabal build --only-dependencies --enable-tests --enable-benchmarks
42+ - name: Build
43+ run: cabal build --enable-tests --enable-benchmarks all
44+ - name: Run tests
45+ run: cabal test all
ChangeLog.md+4
@@ -18,6 +18,10 @@
1818* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
1919 from `Data.Patch` for compatability.
2020
21+## 0.0.4.0
22+
23+* Enable PolyKinds
24+
2125## 0.0.3.2
2226
2327* Update version bounds
patch.cabal+3−2
@@ -28,7 +28,7 @@ tested-with:
2828library
2929 hs-source-dirs: src
3030 default-language: Haskell2010
31− build-depends: base >= 4.9 && < 4.14
31+ build-depends: base >= 4.9 && < 4.15
3232 , constraints-extras >= 0.3 && < 0.4
3333 , containers >= 0.6 && < 0.7
3434 , dependent-map >= 0.3 && < 0.5
@@ -55,6 +55,7 @@ library
5555 , Data.Semigroup.Additive
5656
5757 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
58+ default-extensions: PolyKinds
5859
5960test-suite hlint
6061 default-language: Haskell2010
@@ -65,7 +66,7 @@ test-suite hlint
6566 , directory
6667 , filepath
6768 , filemanip
68− , hlint (< 2.1 || >= 2.2.2) && < 3
69+ , hlint (< 2.1 || >= 2.2.2) && < 3.3
6970 if impl(ghcjs)
7071 buildable: False
7172
src/Data/Patch/Class.hs+1−1
@@ -30,7 +30,7 @@ instance Patch (Identity a) where
3030 apply (Identity a) _ = Just a
3131
3232-- | 'Proxy' can be used as a 'Patch' that does nothing.
33−instance Patch (Proxy a) where
33+instance Patch (Proxy (a :: *)) where
3434 type PatchTarget (Proxy a) = a
3535 apply ~Proxy _ = Nothing
3636