Switch CI to GHC 8.10.2

IntersectMBO · Oct 7, 2020 · 720478f · 720478f
1 parent ffdbf71
commit 720478f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml
@@ -12,7 +12,7 @@ jobs:
     name: "Haddocks"
     runs-on: ubuntu-18.04
     container:
-      image: phadej/ghc:8.6.5-bionic
+      image: phadej/ghc:8.10.2-bionic
     steps:
       - name: set PATH
         run: |
@@ -34,7 +34,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ~/.cabal/store
-          key: cabal-store-8.6.5
+          key: cabal-store-8.10.2
       - name: Update Hackage index
         run: cabal v2-update
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -18,13 +18,13 @@ on: [push]
 # ``
 
 jobs:
-  test-windows-8_6_5:
-    name: "Windows GHC-8.6.5"
+  test-windows-8_10_2:
+    name: "Windows GHC-8.10.2"
     runs-on: windows-latest
     steps:
       - name: Install GHC
         run: |
-          choco install -y ghc --version 8.6.5 --allow-downgrade
+          choco install -y ghc --version 8.10.2 --allow-downgrade
       - name: Print version
         run: |
           cabal --version
@@ -37,7 +37,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: C:\SR
-          key: cabal-store-8.6.5
+          key: cabal-store-8.10.2
       # Cache parts of dist-newstyle (C:\dist)
       - name: cache buiddir [cache]
         uses: actions/cache@v1

diff --git a/cabal.project.local.ci.windows b/cabal.project.local.ci.windows
@@ -1,11 +1,11 @@
-with-compiler: C:\\ProgramData\\chocolatey\\lib\\ghc.8.6.5\\tools\\ghc-8.6.5\\bin\\ghc
+with-compiler: C:\\ProgramData\\chocolatey\\lib\\ghc.8.10.2\\tools\\ghc-8.10.2\\bin\\ghc
 tests: True
 
 max-backjumps: 5000
 reorder-goals: True
 
 package Win32-network
-  ghc-options: -Werror 
+  ghc-options: -Werror
   flags: +demo
 
 package ntp-client

diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -8,7 +8,7 @@
 , buildPackages
 , config ? {}
 # GHC attribute name
-, compiler ? config.haskellNix.compiler or "ghc865"
+, compiler ? config.haskellNix.compiler or "ghc8102"
 # Enable profiling
 , profiling ? config.haskellNix.profiling or false
 , libsodium ? pkgs.libsodium

diff --git a/scripts/install.ps1 b/scripts/install.ps1
@@ -9,6 +9,6 @@ Set-ExecutionPolicy Bypass -Scope Process -Force
 iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
 
 # install work environment
-choco install -y ghc --version 8.6.5
+choco install -y ghc --version 8.10.2
 choco install -y git
 choco install -y firefox