Skip to content

Commit ca364e4

Browse files
committed
GHC-8.10 support for 3.2
Includes cherry-picked commits: - Test cabal-install with GHC-8.10 haskell#6709 - Add GHC-8.10.1 job. Only tests Cabal-the-lib part atm. haskell#6617 Also add topHandler' signature.
1 parent 329ebb1 commit ca364e4

34 files changed

+443
-168
lines changed

.docker/validate-8.10.1.dockerfile

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
FROM phadej/ghc:8.10.1-bionic
2+
3+
# Install cabal-plan
4+
RUN mkdir -p /root/.cabal/bin && \
5+
curl -L https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz && \
6+
echo "de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz" | sha256sum -c - && \
7+
xz -d < cabal-plan.xz > /root/.cabal/bin/cabal-plan && \
8+
rm -f cabal-plan.xz && \
9+
chmod a+x /root/.cabal/bin/cabal-plan
10+
11+
# Update index
12+
RUN cabal v2-update
13+
14+
# We install happy, so it's in the store; we (hopefully) don't use it directly.
15+
RUN cabal v2-install happy --constraint 'happy ^>=1.19.12'
16+
17+
# Install some other dependencies
18+
# Remove $HOME/.ghc so there aren't any environments
19+
RUN cabal v2-install -w ghc-8.10.1 --lib \
20+
aeson \
21+
async \
22+
base-compat \
23+
base16-bytestring \
24+
base64-bytestring \
25+
cryptohash-sha256 \
26+
Diff \
27+
echo \
28+
ed25519 \
29+
edit-distance \
30+
haskell-lexer \
31+
HTTP \
32+
network \
33+
optparse-applicative \
34+
pretty-show \
35+
regex-compat-tdfa \
36+
regex-tdfa \
37+
statistics \
38+
tar \
39+
tasty \
40+
tasty-golden \
41+
tasty-hunit \
42+
tasty-quickcheck \
43+
tree-diff \
44+
zlib \
45+
--constraint="bytestring installed" \
46+
--constraint="binary installed" \
47+
--constraint="containers installed" \
48+
--constraint="deepseq installed" \
49+
--constraint="directory installed" \
50+
--constraint="filepath installed" \
51+
--constraint="pretty installed" \
52+
--constraint="process installed" \
53+
--constraint="time installed" \
54+
--constraint="unix installed" \
55+
&& rm -rf $HOME/.ghc
56+
57+
# Validate
58+
WORKDIR /build
59+
COPY . /build
60+
RUN sh ./validate.sh -w ghc-8.10.1 -v

.github/workflows/artifacts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
echo "::add-path::$HOME/.cabal/bin"
2626
- name: Update Hackage index
2727
run: cabal v2-update
28-
- uses: actions/checkout@v1
28+
- uses: actions/checkout@v2
2929
- name: Release project
3030
run: |
3131
cp cabal.project.release cabal.project
@@ -71,7 +71,7 @@ jobs:
7171
echo "::add-path::$HOME/.cabal/bin"
7272
- name: Update Hackage index
7373
run: cabal v2-update
74-
- uses: actions/checkout@v1
74+
- uses: actions/checkout@v2
7575
- name: Release project
7676
run: |
7777
cp cabal.project.release cabal.project
@@ -115,7 +115,7 @@ jobs:
115115
cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3
116116
- name: Update Hackage index
117117
run: cabal v2-update
118-
- uses: actions/checkout@v1
118+
- uses: actions/checkout@v2
119119
- name: Release project
120120
shell: bash
121121
run: |

.github/workflows/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set PATH
2727
run: |
2828
echo "::add-path::/opt/ghc/8.6.5/bin"
29-
- uses: actions/checkout@v1
29+
- uses: actions/checkout@v2
3030
- name: bootstrap.sh
3131
env:
3232
EXTRA_CONFIGURE_OPTS: ""
@@ -53,7 +53,7 @@ jobs:
5353
run: |
5454
echo "::add-path::/opt/ghc/8.6.5/bin"
5555
echo "::add-path::$HOME/.cabal/bin"
56-
- uses: actions/checkout@v1
56+
- uses: actions/checkout@v2
5757
- name: bootstrap.sh
5858
env:
5959
EXTRA_CONFIGURE_OPTS: ""

0 commit comments

Comments
 (0)