Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
binary
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rinat Striungis
binary
Commits
0318374b
Unverified
Commit
0318374b
authored
6 years ago
by
Lennart Kolmodin
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #156 from kolmodin/pr/ghc861
Add GHC 8.6.1 to travis and docker.
parents
00224cc1
6bdae6c0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+2
-0
2 additions, 0 deletions
.travis.yml
docker-compose.yml
+10
-1
10 additions, 1 deletion
docker-compose.yml
docker/Dockerfile.anyghc
+5
-4
5 additions, 4 deletions
docker/Dockerfile.anyghc
with
17 additions
and
5 deletions
.travis.yml
+
2
−
0
View file @
0318374b
...
...
@@ -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
]}}
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
10
−
1
View file @
0318374b
...
...
@@ -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.ghc
843
dockerfile
:
docker/Dockerfile.
any
ghc
args
:
-
ghcver=8.4.3
volumes
:
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.anyghc
+
5
−
4
View file @
0318374b
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment