Skip to content
Snippets Groups Projects
Unverified Commit 0318374b authored by Lennart Kolmodin's avatar Lennart Kolmodin Committed by GitHub
Browse files

Merge pull request #156 from kolmodin/pr/ghc861

Add GHC 8.6.1 to travis and docker.
parents 00224cc1 6bdae6c0
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,8 @@ matrix:
addons: {apt: {packages: [cabal-install-1.24,ghc-8.2.2], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.4.3
addons: {apt: {packages: [cabal-install-1.24,ghc-8.4.3], sources: [hvr-ghc]}}
- env: CABALVER=2.4 GHCVER=8.6.1
addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
- env: CABALVER=head GHCVER=head
addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
......
......@@ -22,10 +22,19 @@
version: '3'
services:
binary_ghc861:
build:
context: .
dockerfile: docker/Dockerfile.anyghc
args:
- ghcver=8.6.1
volumes:
- cabal-store-cache:/root/.cabal/store
binary_ghc843:
build:
context: .
dockerfile: docker/Dockerfile.ghc843
dockerfile: docker/Dockerfile.anyghc
args:
- ghcver=8.4.3
volumes:
......
......@@ -74,24 +74,25 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574
RUN echo "deb http://downloads.haskell.org/debian stretch main" > /etc/apt/sources.list.d/haskell.list
ARG ghcver=8.4.3
ARG cabalinstallver=2.4
RUN apt update && apt install -y cabal-install-2.2
RUN apt update && apt install -y cabal-install-$cabalinstallver
RUN apt update && apt install -y ghc-$ghcver
RUN apt update && apt-get install -y zlib1g-dev
ENV PATH=/opt/ghc/bin:$PATH
RUN cabal update
RUN cabal new-update
COPY . /workdir/copy
WORKDIR /workdir/copy
RUN sed -i.bak -e 's/name:\s*binary/name: binary-next/' binary.cabal
RUN mv binary.cabal binary-next.cabal
RUN cabal sdist
RUN cabal new-sdist
WORKDIR /workdir/builddir
RUN tar xf /workdir/copy/dist/*.tar.gz -C /workdir/builddir
RUN tar xf /workdir/copy/dist-newstyle/sdist/*.tar.gz -C /workdir/builddir
RUN mv /workdir/builddir/binary-* /workdir/builddir/binary-next
# generics-bench.cache.gz is not part of the binary distribution,
# it's too large. It only lives in the git repo. Copy it manually.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment