[#55] Support GHC-9.0 (#57)

* [#55] Support GHC-9.0 Resolves #55 * Update .github/workflows/ci.yml Co-authored-by: Dmitrii Kovanikov <kovanikov@gmail.com> Co-authored-by: Dmitrii Kovanikov <kovanikov@gmail.com>
kowainik · Apr 5, 2021 · 1a52063 · 1a52063
1 parent 704c2f1
commit 1a52063
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,10 +1,13 @@
 name: CI
 
-# Trigger the workflow on push or pull request, but only for the main branch
 on:
   pull_request:
+    types: [synchronize, opened, reopened]
   push:
     branches: [main]
+  schedule:
+    # additionally run once per week (At 00:00 on Sunday) to maintain cache
+    - cron: '0 0 * * 0'
 
 jobs:
   cabal:
@@ -13,14 +16,17 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        cabal: ["3.2"]
+        cabal: ["3.4"]
         ghc:
           - "8.2.2"
           - "8.4.4"
           - "8.6.5"
           - "8.8.4"
-          - "8.10.2"
+          - "8.10.4"
+          - "9.0.1"
         exclude:
+          - os: macOS-latest
+            ghc: 8.10.4
           - os: macOS-latest
             ghc: 8.8.4
           - os: macOS-latest
@@ -29,6 +35,9 @@ jobs:
             ghc: 8.4.4
           - os: macOS-latest
             ghc: 8.2.2
+
+          - os: windows-latest
+            ghc: 8.10.4
           - os: windows-latest
             ghc: 8.8.4
           - os: windows-latest
@@ -39,15 +48,18 @@ jobs:
             ghc: 8.2.2
     steps:
     - uses: actions/checkout@v2
-      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
 
-    - uses: actions/setup-haskell@v1.1.4
+    - uses: haskell/actions/setup@v1
       id: setup-haskell-cabal
       name: Setup Haskell
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ matrix.cabal }}
 
+    - name: Configure
+      run: |
+        cabal configure --enable-tests --enable-benchmarks --enable-documentation --test-show-details=direct --write-ghc-environment-files=always
+
     - name: Freeze
       run: |
         cabal freeze
@@ -60,7 +72,6 @@ jobs:
 
     - name: Install dependencies
       run: |
-        cabal configure --enable-tests --enable-benchmarks --test-show-details=direct
         cabal build all --only-dependencies
 
     - name: Build
@@ -71,25 +82,28 @@ jobs:
       run: |
         cabal test all
 
+    - name: Documentation
+      run: |
+        cabal haddock
+
   stack:
     name: stack / ghc ${{ matrix.ghc }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        stack: ["2.3.1"]
-        ghc: ["8.8.3"]
+        stack: ["2.5"]
+        ghc: ["8.10.4"]
 
     steps:
     - uses: actions/checkout@v2
-      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
 
-    - uses: actions/setup-haskell@v1.1.4
+    - uses: haskell/actions/setup@v1
       name: Setup Haskell Stack
       with:
         ghc-version: ${{ matrix.ghc }}
         stack-version: ${{ matrix.stack }}
 
-    - uses: actions/cache@v2.1.4
+    - uses: actions/cache@v1
       name: Cache ~/.stack
       with:
         path: ~/.stack

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 `colourista` uses [PVP Versioning][1].
 The changelog is available [on GitHub][2].
 
+## Unreleased
+
+* [#55](https://github.com/kowainik/colourista/issues/55):
+  Support GHC-9.0.
+
 ## 0.1.0.0 — May 2, 2020 🌈
 
 * [#22](https://github.com/kowainik/colourista/issues/22):

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ colouring and emphasis.
 
 In order to start using `colourista` in your project, you will need to set it up with the three easy steps:
 
-1. Add the dependency on `colorista` in your project's `.cabal` file. For this,
+1. Add the dependency on `colourista` in your project's `.cabal` file. For this,
    you should modify the `build-depends` section by adding the name of this
    library. After the adjustment, this section could look like this:
 

diff --git a/colourista.cabal b/colourista.cabal
@@ -18,14 +18,15 @@ tested-with:         GHC == 8.2.2
                      GHC == 8.4.4
                      GHC == 8.6.5
                      GHC == 8.8.4
-                     GHC == 8.10.2
+                     GHC == 8.10.4
+                     GHC == 9.0.1
 
 source-repository head
   type:                git
   location:            https://github.com/kowainik/colourista.git
 
 common common-options
-  build-depends:       base >= 4.10.1.0 && < 4.15
+  build-depends:       base >= 4.10.1.0 && < 4.16
 
   ghc-options:         -Wall
                        -Wcompat
@@ -71,8 +72,8 @@ library
                          Colourista.Short
 
   build-depends:       ansi-terminal >= 0.10 && < 0.12
-                     , bytestring ^>= 0.10
-                     , ghc-prim >= 0.5 && < 0.7
+                     , bytestring >= 0.10 && < 0.12
+                     , ghc-prim >= 0.5 && < 0.8
                      , text ^>= 1.2.3.0
 
 test-suite colourista-test

diff --git a/stack.yaml b/stack.yaml
@@ -1 +1 @@
-resolver: lts-15.8
+resolver: lts-17.8