Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GHC musl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
GHC musl
Commits
8dcfea34
Verified
Commit
8dcfea34
authored
1 year ago
by
Olivier Benz
Browse files
Options
Downloads
Patches
Plain Diff
Rebuild GHC version 9.8.1
- Use GHC 9.6.4 for bootstrapping - Update base image to alpine:3.19
parent
2839c1f2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#25800
passed
1 year ago
Stage: build1
Stage: build2
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
latest.Dockerfile
+15
-18
15 additions, 18 deletions
latest.Dockerfile
with
17 additions
and
20 deletions
.gitlab-ci.yml
+
2
−
2
View file @
8dcfea34
.env
:
.env
:
variables
:
variables
:
GHC_VERSION
:
"
9.
6.4
"
GHC_VERSION
:
"
9.
8.1
"
CABAL_VERSION
:
"
3.10.
1.0
"
CABAL_VERSION
:
"
3.10.
2.1
"
STACK_VERSION
:
"
2.13.1"
STACK_VERSION
:
"
2.13.1"
HLS_VERSION
:
"
2.5.0.0"
HLS_VERSION
:
"
2.5.0.0"
BUILD_GHC
:
"
true"
BUILD_GHC
:
"
true"
...
...
This diff is collapsed.
Click to expand it.
latest.Dockerfile
+
15
−
18
View file @
8dcfea34
...
@@ -5,13 +5,7 @@ ARG STACK_VERSION
...
@@ -5,13 +5,7 @@ ARG STACK_VERSION
ARG
GHC_VERSION_BUILD=${GHC_VERSION}
ARG
GHC_VERSION_BUILD=${GHC_VERSION}
ARG
CABAL_VERSION_BUILD=${CABAL_VERSION}
ARG
CABAL_VERSION_BUILD=${CABAL_VERSION}
FROM
glcr.b-data.ch/ghc/ghc-musl:9.6.3
as
bootstrap
FROM
glcr.b-data.ch/ghc/ghc-musl:9.6.4
as
bootstrap
ARG
GHC_VERSION_BUILD
ARG
CABAL_VERSION_BUILD
ENV
GHC_VERSION=${GHC_VERSION_BUILD} \
CABAL_VERSION=${CABAL_VERSION_BUILD}
RUN
apk upgrade
--no-cache
\
RUN
apk upgrade
--no-cache
\
&&
apk add
--no-cache
\
&&
apk add
--no-cache
\
...
@@ -32,6 +26,12 @@ RUN apk upgrade --no-cache \
...
@@ -32,6 +26,12 @@ RUN apk upgrade --no-cache \
xz
\
xz
\
zlib-dev
zlib-dev
FROM
bootstrap
as
bootstrap-ghc
ARG
GHC_VERSION_BUILD
ENV
GHC_VERSION=${GHC_VERSION_BUILD}
RUN
cd
/tmp
\
RUN
cd
/tmp
\
&&
curl
-sSLO
https://downloads.haskell.org/~ghc/
"
$GHC_VERSION
"
/ghc-
"
$GHC_VERSION
"
-src
.tar.xz
\
&&
curl
-sSLO
https://downloads.haskell.org/~ghc/
"
$GHC_VERSION
"
/ghc-
"
$GHC_VERSION
"
-src
.tar.xz
\
&&
curl
-sSLO
https://downloads.haskell.org/~ghc/
"
$GHC_VERSION
"
/ghc-
"
$GHC_VERSION
"
-src
.tar.xz.sig
\
&&
curl
-sSLO
https://downloads.haskell.org/~ghc/
"
$GHC_VERSION
"
/ghc-
"
$GHC_VERSION
"
-src
.tar.xz.sig
\
...
@@ -58,12 +58,16 @@ RUN cd /tmp \
...
@@ -58,12 +58,16 @@ RUN cd /tmp \
FROM
bootstrap
as
bootstrap-cabal
FROM
bootstrap
as
bootstrap-cabal
ARG
CABAL_VERSION_BUILD
ENV
CABAL_VERSION=${CABAL_VERSION_BUILD}
## Build Cabal (the tool) with the GHC bootstrap version
## Build Cabal (the tool) with the GHC bootstrap version
RUN
cabal update
\
RUN
cabal update
\
## See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
## See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
&& cabal install
--allow-newer --constraint 'Cabal-syntax<3.11'
"cabal-install-$CABAL_VERSION"
&& cabal install "cabal-install-$CABAL_VERSION"
FROM
alpine:3.1
8
as
ghc-stage1
FROM
alpine:3.1
9
as
ghc-stage1
LABEL
org.opencontainers.image.licenses="MIT" \
LABEL
org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc-musl" \
org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc-musl" \
...
@@ -112,16 +116,9 @@ RUN apk add --no-cache \
...
@@ -112,16 +116,9 @@ RUN apk add --no-cache \
zlib-dev \
zlib-dev \
zlib-static
zlib-static
COPY
--from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz /tmp/
COPY
--from=bootstrap
-ghc
/tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz /tmp/
RUN
cd
/tmp
\
RUN
cd
/tmp
\
## Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
## Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
## Install GHC
## Install GHC
&& tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
&& tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
&& cd ghc-"$GHC_VERSION"-*-alpine-linux \
&& cd ghc-"$GHC_VERSION"-*-alpine-linux \
...
@@ -144,7 +141,7 @@ COPY --from=bootstrap-cabal /root/.local/bin/cabal /usr/local/bin/cabal
...
@@ -144,7 +141,7 @@ COPY --from=bootstrap-cabal /root/.local/bin/cabal /usr/local/bin/cabal
## Rebuild Cabal (the tool) with the GHC target version
## Rebuild Cabal (the tool) with the GHC target version
RUN
cabal update
\
RUN
cabal update
\
&&
cabal
install
--allow-newer
--constraint
'Cabal-syntax<3.11'
"cabal-install-
$CABAL_VERSION
"
&&
cabal
install
"cabal-install-
$CABAL_VERSION
"
FROM
ghc-stage1
as
test
FROM
ghc-stage1
as
test
...
...
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