[kowainik#389] Update GHC to 8.10.4 (kowainik#390)

* [kowainik#389] Update GHC to 8.10.4 Resolves kowainik#389 * Update .cabal file
praduca · Feb 23, 2021 · 2447123 · 2447123
1 parent 69c2b73
commit 2447123
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,25 +1,24 @@
 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]
 
 jobs:
   build:
     name: Build Learn4Haskell
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         cabal: ["3.2"]
-        ghc: ["8.10.2"]
+        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
       with:
         ghc-version: ${{ matrix.ghc }}
@@ -37,16 +36,15 @@ jobs:
 
   chapter1:
     name: Chapter One
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         cabal: ["3.2"]
-        ghc: ["8.10.2"]
+        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
       with:
         ghc-version: ${{ matrix.ghc }}
@@ -73,16 +71,15 @@ jobs:
 
   chapter2:
     name: Chapter Two
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         cabal: ["3.2"]
-        ghc: ["8.10.2"]
+        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
       with:
         ghc-version: ${{ matrix.ghc }}
@@ -109,16 +106,15 @@ jobs:
 
   chapter3:
     name: Chapter Three
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         cabal: ["3.2"]
-        ghc: ["8.10.2"]
+        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
       with:
         ghc-version: ${{ matrix.ghc }}
@@ -136,16 +132,15 @@ jobs:
 
   chapter4:
     name: Chapter Four
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         cabal: ["3.2"]
-        ghc: ["8.10.2"]
+        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
       with:
         ghc-version: ${{ matrix.ghc }}

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ already and don't try to go out of those boundaries.
 But why not use this time to learn something challenging, something fresh,
 something that you never had time for?
 
-You can get the benefits of Hacktoberfest while learning something new 
+You can get the benefits of Hacktoberfest while learning something new
 fascinating concepts – Functional Programming with Haskell.
 
 And we're here to help!
@@ -154,6 +154,7 @@ Starting to learn Haskell with Learn4Haskell is a piece of cake!
    [Pull Request](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
    __to your fork__ with the solution and mention @vrom911 and @chshersh and we
    would be on our way for the review.
+
  > Note, that you should open a PR for your fork of this repo, not this repo.
  > Everyone has their solutions to the included tasks, and they don't mix together
  > well in one repo 🙂
@@ -170,13 +171,12 @@ install all the necessary items to be able to run this course locally.
 ### Installing Haskell
 
 If you're on Windows, install the `haskell-dev` and `make` packages [using Chocolatey](https://chocolatey.org/install).
+
 ```shell
 choco install haskell-dev make
 refreshenv
 ```
 
-Then, do [the workaround](https://www.stackage.org/blog/2020/08/ghc-8-10-2-windows-workaround) to alleviate a GHC 8.10.2 issue on Windows which prevents the test suite from building correctly.
-
 If you're on Linux or macOS, then the process is easy:
 
 1. Install [ghcup](https://www.haskell.org/ghcup/) and follow `ghcup`
@@ -187,8 +187,8 @@ If you're on Linux or macOS, then the process is easy:
    terminal
 
     ```shell
-    ghcup install ghc 8.10.2
-    ghcup set ghc 8.10.2
+    ghcup install ghc 8.10.4
+    ghcup set ghc 8.10.4
     ghcup install cabal 3.2.0.0
     ```
 3. Run `cabal update` to fetch the latest info about Haskell packages.

diff --git a/learn4haskell.cabal b/learn4haskell.cabal
@@ -15,7 +15,7 @@ copyright:           2020 Kowainik
 build-type:          Simple
 extra-doc-files:     README.md
                      CHANGELOG.md
-tested-with:         GHC == 8.10.2
+tested-with:         GHC == 8.10.4
 
 source-repository head
   type:                git
@@ -65,7 +65,7 @@ test-suite learn4haskell-test
   build-depends:       learn4haskell
                      , hspec ^>= 2.7.4
                      , hspec-hedgehog
-                     , hedgehog  >= 1.0.2 && < 2 
+                     , hedgehog  >= 1.0.2 && < 2
   ghc-options:         -threaded
                        -rtsopts
                        -with-rtsopts=-N