Skip to content

Commit 668eaac

Browse files
authored
Merge pull request #6469 from haskell/workflow-validate
Use GitHub Actions
2 parents fc4ce69 + 877ffa4 commit 668eaac

12 files changed

+1309
-162
lines changed

.docker/validate-7.6.3.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ RUN cabal v2-install -w ghc-7.6.3 --lib \
6363
# Validate
6464
WORKDIR /build
6565
COPY . /build
66-
RUN sh ./validate.sh -l -w ghc-7.6.3 -v
66+
RUN sh ./validate.sh --lib-only -w ghc-7.6.3 -v

.docker/validate-7.8.4.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ RUN cabal v2-install -w ghc-7.8.4 --lib \
6363
# Validate
6464
WORKDIR /build
6565
COPY . /build
66-
RUN sh ./validate.sh -l -w ghc-7.8.4 -v
66+
RUN sh ./validate.sh --lib-only -w ghc-7.8.4 -v

.docker/validate-8.8.1.dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ RUN mkdir -p /root/.cabal/bin && \
88
rm -f cabal-plan.xz && \
99
chmod a+x /root/.cabal/bin/cabal-plan
1010

11+
# install cabal-env
12+
RUN curl -sL https://github.com/phadej/cabal-extras/releases/download/preview-20191225/cabal-env-snapshot-20191225-x86_64-linux.xz > cabal-env.xz && \
13+
echo "1b567d529c5f627fd8c956e57ae8f0d9f11ee66d6db34b7fb0cb1c370b4edf01 cabal-env.xz" | sha256sum -c - && \
14+
xz -d < cabal-env.xz > $HOME/.cabal/bin/cabal-env && \
15+
rm -f cabal-env.xz && \
16+
chmod a+x $HOME/.cabal/bin/cabal-env
17+
1118
# Update index
1219
RUN cabal v2-update
1320

@@ -49,4 +56,4 @@ RUN cabal v2-install -w ghc-8.8.1 --lib \
4956
# Validate
5057
WORKDIR /build
5158
COPY . /build
52-
RUN sh ./validate.sh -w ghc-8.8.1 -v -D -b
59+
RUN sh ./validate.sh -w ghc-8.8.1 -v --doctest --solver-benchmarks

.docker/validate-old.dockerfile

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
FROM phadej/ghc:8.8.1-xenial
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+
# Install older compilers
12+
RUN apt-get update
13+
RUN apt-get install -y ghc-7.0.4 ghc-7.0.4-dyn ghc-7.2.2 ghc-7.2.2-dyn ghc-7.4.2 ghc-7.4.2-dyn
14+
15+
# Update index
16+
RUN cabal v2-update
17+
18+
# We install happy, so it's in the store; we (hopefully) don't use it directly.
19+
RUN cabal v2-install happy --constraint 'happy ^>=1.19.12'
20+
21+
# Install some other dependencies
22+
# Remove $HOME/.ghc so there aren't any environments
23+
RUN cabal v2-install -w ghc-8.8.1 --lib \
24+
aeson \
25+
async \
26+
base-compat \
27+
base16-bytestring \
28+
base64-bytestring \
29+
cryptohash-sha256 \
30+
Diff \
31+
echo \
32+
ed25519 \
33+
edit-distance \
34+
haskell-lexer \
35+
HTTP \
36+
network \
37+
optparse-applicative \
38+
pretty-show \
39+
regex-compat-tdfa \
40+
regex-tdfa \
41+
resolv \
42+
statistics \
43+
tar \
44+
tasty \
45+
tasty-golden \
46+
tasty-hunit \
47+
tasty-quickcheck \
48+
tree-diff \
49+
zlib \
50+
&& rm -rf $HOME/.ghc
51+
52+
# Validate
53+
WORKDIR /build
54+
COPY . /build
55+
RUN sh ./validate.sh -w ghc-8.8.1 -v --lib-only --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4 --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2 --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2

0 commit comments

Comments
 (0)