git.iko.soy/patch
on develop help sign in
Merge remote-tracking branch 'origin/develop' into patch-map-inner-patch-desugar
commit220acfcb4ee3e37318702eec2f1bebe7031a8861 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 22 Apr 2021, 12:09 (5 years ago) parent09fe27668cf321
4 files changed+54−4
compare with develop
unifiedsplit
.github/workflows/haskell.yml+45 ChangeLog.md+4 patch.cabal+4−3 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
@@ -6,6 +6,10 @@
66 Care is taken to make this as little of a breaking change as possible.
77 In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove` as is the `NodeInfo` of `PatchMapWithPatchingMove`'s `NodeInfo`.
88
9+## 0.0.4.0
10+
11+* Enable PolyKinds
12+
913## 0.0.3.2
1014
1115* Update version bounds
patch.cabal+4−3
@@ -1,5 +1,5 @@
11Name: patch
2−Version: 0.0.3.2
2+Version: 0.0.4.0
33Synopsis: Data structures for describing changes to other data structures.
44Description:
55 Data structures for describing changes to other data structures.
@@ -33,7 +33,7 @@ flag split-these
3333library
3434 hs-source-dirs: src
3535 default-language: Haskell2010
36− build-depends: base >= 4.9 && < 4.14
36+ build-depends: base >= 4.9 && < 4.15
3737 , constraints-extras >= 0.3 && < 0.4
3838 , containers >= 0.6 && < 0.7
3939 , dependent-map >= 0.3 && < 0.5
@@ -55,6 +55,7 @@ library
5555 , Data.Patch.MapWithPatchingMove
5656
5757 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
58+ default-extensions: PolyKinds
5859
5960 if flag(split-these)
6061 build-depends: these >= 1 && <1.2
@@ -73,7 +74,7 @@ test-suite hlint
7374 , directory
7475 , filepath
7576 , filemanip
76− , hlint (< 2.1 || >= 2.2.2) && < 3
77+ , hlint (< 2.1 || >= 2.2.2) && < 3.3
7778 if impl(ghcjs)
7879 buildable: False
7980
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