Skip to content

Commit 206d705

Browse files
committed
Switch CI to GHC 8.10.2
1 parent e610c27 commit 206d705

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/github-page.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: "Haddocks"
1313
runs-on: ubuntu-18.04
1414
container:
15-
image: phadej/ghc:8.6.5-bionic
15+
image: phadej/ghc:8.10.2-bionic
1616
steps:
1717
- name: set PATH
1818
run: |
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/cache@v1
3535
with:
3636
path: ~/.cabal/store
37-
key: cabal-store-8.6.5
37+
key: cabal-store-8.10.2
3838
- name: Update Hackage index
3939
run: cabal v2-update
4040

.github/workflows/windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ on: [push]
1818
# ``
1919

2020
jobs:
21-
test-windows-8_6_5:
22-
name: "Windows GHC-8.6.5"
21+
test-windows-8_10_2:
22+
name: "Windows GHC-8.10.2"
2323
runs-on: windows-latest
2424
steps:
2525
- name: Install GHC
2626
run: |
27-
choco install -y ghc --version 8.6.5 --allow-downgrade
27+
choco install -y ghc --version 8.10.2 --allow-downgrade
2828
- name: Print version
2929
run: |
3030
cabal --version
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/cache@v1
3838
with:
3939
path: C:\SR
40-
key: cabal-store-8.6.5
40+
key: cabal-store-8.10.2
4141
# Cache parts of dist-newstyle (C:\dist)
4242
- name: cache buiddir [cache]
4343
uses: actions/cache@v1

cabal.project.local.ci.windows

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
with-compiler: C:\\ProgramData\\chocolatey\\lib\\ghc.8.6.5\\tools\\ghc-8.6.5\\bin\\ghc
1+
with-compiler: C:\\ProgramData\\chocolatey\\lib\\ghc.8.10.2\\tools\\ghc-8.10.2\\bin\\ghc
22
tests: True
33

44
max-backjumps: 5000
55
reorder-goals: True
66

77
package Win32-network
8-
ghc-options: -Werror
8+
ghc-options: -Werror
99
flags: +demo
1010

1111
package ntp-client

nix/haskell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
, buildPackages
99
, config ? {}
1010
# GHC attribute name
11-
, compiler ? config.haskellNix.compiler or "ghc865"
11+
, compiler ? config.haskellNix.compiler or "ghc8102"
1212
# Enable profiling
1313
, profiling ? config.haskellNix.profiling or false
1414
, libsodium ? pkgs.libsodium

scripts/install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ Set-ExecutionPolicy Bypass -Scope Process -Force
99
iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
1010

1111
# install work environment
12-
choco install -y ghc --version 8.6.5
12+
choco install -y ghc --version 8.10.2
1313
choco install -y git
1414
choco install -y firefox

0 commit comments

Comments
 (0)