[#10] Support GHC-8.10 (#11)

* [#10] Support GHC-8.10

Resolves #10

* Update README.md

Co-Authored-By: Veronika Romashkina <[email protected]>

Co-authored-by: Veronika Romashkina <[email protected]>

Author: chshersh

.github/workflows/ci.yml

@@ -0,0 +1,48 @@
+name: CI
+
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the master branch
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    name: ghc ${{ matrix.ghc }}
+    runs-on: ubuntu-16.04
+    strategy:
+      matrix:
+        cabal: ["3.0"]
+        ghc:
+          - "8.2.2"
+          - "8.4.4"
+          - "8.6.5"
+          - "8.8.3"
+          - "8.10.1"
+
+    steps:
+    - uses: actions/checkout@v2
+      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
+
+    - uses: actions/setup-haskell@v1
+      name: Setup Haskell
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        cabal-version: ${{ matrix.cabal }}
+
+    - uses: actions/cache@v1
+      name: Cache ~/.cabal/store
+      with:
+        path: ~/.cabal/store
+        key: ${{ runner.os }}-${{ matrix.ghc }}-cabal
+
+    - name: Build
+      run: |
+        cabal update
+        cabal build all --enable-tests --enable-benchmarks --write-ghc-environment-files=always
+
+    - name: Test
+      run: |
+        cabal test all --enable-tests --test-show-details=direct

.travis.yml

@@ -1,54 +1,28 @@
 sudo: true
-language: haskell
+language: generic
 
 git:
   depth: 5
 
-cabal: "3.0"
-
 cache:
   directories:
-  - "$HOME/.cabal/store"
   - "$HOME/.stack"
-  - "$TRAVIS_BUILD_DIR/.stack-work"
 
 matrix:
   include:
-  - ghc: 8.2.2
-  - ghc: 8.4.4
-  - ghc: 8.6.5
-  - ghc: 8.8.1
-
-  - ghc: 8.8.1
-    env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
-
-  - language: nix
-    install: echo 'Running nix...'
-    script: nix-shell --run 'cabal v2-test --enable-tests'
+  - env: GHC='8.8.3'
+    os: linux
+  - env: GHC='8.8.3'
+    os: osx
 
 install:
-  # HLint check
-  - curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint .
-
-  - |
-    if [ -z "$STACK_YAML" ]; then
-      ghc --version
-      cabal --version
-      cabal update
-      cabal build --enable-tests --enable-benchmarks
-    else
-      curl -sSL https://get.haskellstack.org/ | sh
-      stack --version
-      stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks
-    fi
+  # install stack and build project
+  - curl -sSL https://get.haskellstack.org/ | sh
+  - stack --version
+  - stack build --test --no-run-tests --bench --no-run-benchmarks
 
 script:
-  - |
-    if [ -z "$STACK_YAML" ]; then
-       cabal test --enable-tests
-    else
-      stack test --system-ghc
-    fi
+  - stack test --no-terminal
 
 notifications:
   email: false

CHANGELOG.md

@@ -3,11 +3,15 @@
 `type-errors-pretty` uses [PVP Versioning][1].
 The changelog is available [on GitHub][2].
 
+## 0.0.1.1 — Apr 18, 2020
+
+* [#10](https://github.com/chshersh/type-errors-pretty/issues/10):
+  Support GHC-8.10.
+
 ## 0.0.1.0 — Oct 15, 2019
 
-* [#216](https://github.com/chshersh/type-errors-pretty/pull/5):
+* [#5](https://github.com/chshersh/type-errors-pretty/pull/5):
   Support GHC-8.8.
-  (by [@chshersh](https://github.com/chshersh))
 
 ## 0.0.0.0 — Jul 15, 2019
 

README.md

@@ -1,12 +1,16 @@
 # type-errors-pretty
 
 ![pretty-bug](https://user-images.githubusercontent.com/4276606/61183911-eda86300-a679-11e9-9b8e-34c129469075.png)
-[![Build status](https://img.shields.io/travis/chshersh/type-errors-pretty.svg?logo=travis)](https://travis-ci.org/chshersh/type-errors-pretty)
+
+[![GitHub CI](https://github.com/chshersh/type-errors-pretty/workflows/CI/badge.svg)](https://github.com/chshersh/type-errors-pretty/actions)
+[![Build status](https://img.shields.io/travis/com/chshersh/type-errors-pretty/master?logo=travis)](https://travis-ci.com/chshersh/type-errors-pretty)
+[![Windows build status](https://ci.appveyor.com/api/projects/status/github/chshersh/type-errors-pretty?branch=master&svg=true)](https://ci.appveyor.com/project/chshersh/type-errors-pretty)
 [![Hackage](https://img.shields.io/hackage/v/type-errors-pretty.svg?logo=haskell)](https://hackage.haskell.org/package/type-errors-pretty)
 [![Stackage Lts](http://stackage.org/package/type-errors-pretty/badge/lts)](http://stackage.org/lts/package/type-errors-pretty)
 [![Stackage Nightly](http://stackage.org/package/type-errors-pretty/badge/nightly)](http://stackage.org/nightly/package/type-errors-pretty)
 [![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](LICENSE)
 
+
 > "It is important that we forgive ourselves for making mistakes. We need to learn
 > from our errors and move on."
 >

appveyor.yml

@@ -0,0 +1,34 @@
+clone_folder: "c:\\WORK"
+clone_depth: 5
+
+# Do not build feature branch with open Pull Requests
+skip_branch_with_pr: true
+
+platform:
+  - x86_64
+
+cache:
+  - "C:\\SR"
+  - dist-newstyle
+
+environment:
+  global:
+    CABOPTS: --store-dir=C:\\SR
+
+  matrix:
+    - GHCVER: 8.8.3
+
+install:
+  - choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
+  - choco install -y cabal --version 3.0.0.0
+  - choco install -y ghc   --version %GHCVER%
+  - refreshenv
+
+before_build:
+  - cabal --version
+  - ghc   --version
+  - cabal %CABOPTS% update
+
+build_script:
+  - cabal %CABOPTS% build --enable-tests --write-ghc-environment-files=always
+  - cabal %CABOPTS% test  --enable-tests

default.nix

@@ -1 +1 @@
-resolver: nightly-2019-10-15
+resolver: lts-15.8

stack.yaml

@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                type-errors-pretty
-version:             0.0.1.0
+version:             0.0.1.1
 synopsis:            Combinators for writing pretty type errors easily
 description:
     This library provides replacements for the @ErrorMessage@ constructors to
@@ -19,24 +19,31 @@ extra-doc-files:     README.md
 tested-with:         GHC == 8.2.2
                      GHC == 8.4.4
                      GHC == 8.6.5
-                     GHC == 8.8.1
+                     GHC == 8.8.3
+                     GHC == 8.10.1
 
 source-repository head
   type:                git
   location:            https://github.com/chshersh/type-errors-pretty.git
 
 common common-options
-  build-depends:       base >= 4.10.1.0 && < 4.14
+  build-depends:       base >= 4.10.1.0 && < 4.15
+
   ghc-options:         -Wall
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
                        -Wcompat
                        -Widentities
+                       -Wincomplete-uni-patterns
+                       -Wincomplete-record-updates
                        -Wredundant-constraints
-                       -fhide-source-paths
-  if impl(ghc >= 8.8.1)
+  if impl(ghc >= 8.2)
+    ghc-options:       -fhide-source-paths
+  if impl(ghc >= 8.4)
+    ghc-options:       -Wmissing-export-lists
+                       -Wpartial-fields
+  if impl(ghc >= 8.8)
     ghc-options:       -Wmissing-deriving-strategies
-                       -Werror=missing-deriving-strategies
+  if impl(ghc >= 8.10)
+    ghc-options:       -Wunused-packages
 
   default-language:    Haskell2010
   default-extensions:  ConstraintKinds