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
f811dd3d
Verified
Commit
f811dd3d
authored
1 year ago
by
Olivier Benz
Browse files
Options
Downloads
Patches
Plain Diff
Rebuild GHC v9.6.2, Add Stack v2.11.1
- Move cabal to /usr/local/bin
parent
b42146be
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#22990
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-9
2 additions, 9 deletions
.gitlab-ci.yml
latest.Dockerfile
+10
-1
10 additions, 1 deletion
latest.Dockerfile
with
12 additions
and
10 deletions
.gitlab-ci.yml
+
2
−
9
View file @
f811dd3d
...
...
@@ -35,8 +35,8 @@
DOCKER_DRIVER
:
overlay2
DOCKER_TLS_CERTDIR
:
"
/certs"
BUILDX_NO_DEFAULT_ATTESTATIONS
:
"
true"
GHC_VERSION_BUILD
:
"
9.
4.6
"
CABAL_VERSION_BUILD
:
"
3.
8
.1.0"
GHC_VERSION_BUILD
:
"
9.
6.2
"
CABAL_VERSION_BUILD
:
"
3.
10
.1.0"
STACK_VERSION
:
"
2.11.1"
before_script
:
-
*before-script-build
...
...
@@ -201,13 +201,6 @@ build-manifest:version-linux-multiarch:
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi
docker manifest push $CI_APP_REPO:$CI_APP_TAG
-
|
docker manifest create $CI_APP_REPO:$VERSION_MAJ_MIN $CI_MANIFEST_LIST
if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then
docker manifest annotate --variant v8 $CI_APP_REPO:$VERSION_MAJ_MIN \
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules
:
-
if
:
$CI_COMMIT_BRANCH == "freeze-version"
changes
:
...
...
This diff is collapsed.
Click to expand it.
latest.Dockerfile
+
10
−
1
View file @
f811dd3d
ARG
GHC_VERSION_BUILD
ARG
CABAL_VERSION_BUILD
ARG
STACK_VERSION
FROM
glcr.b-data.ch/ghc/ghc-musl:9.4.6
as
bootstrap
...
...
@@ -99,7 +100,7 @@ RUN apk upgrade --no-cache \
zlib-static
COPY
--from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz /tmp/
COPY
--from=bootstrap /root/.cabal/bin/cabal /usr/bin/cabal
COPY
--from=bootstrap /root/.cabal/bin/cabal /usr/
local/
bin/cabal
RUN
cd
/tmp
\
&&
tar
-xJf
ghc-
"
$GHC_VERSION
"
-
*
-alpine-linux
.tar.xz
\
...
...
@@ -125,6 +126,14 @@ RUN ghc -static -optl-pthread -optl-static Main.hs \
&& cabal init -n --is-executable -p tester -l MIT \
&& cabal run
FROM
glcr.b-data.ch/commercialhaskell/ssi:${STACK_VERSION}
as
ssi
FROM
builder
as
final
ARG
STACK_VERSION
ENV
STACK_VERSION=${STACK_VERSION}
COPY
--from=ssi /usr/local/bin/stack /usr/local/bin/stack
CMD
["ghci"]
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