Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
ci-images
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
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
Glasgow Haskell Compiler
ci-images
Commits
4c9b1b71
Commit
4c9b1b71
authored
2 years ago
by
Ben Gamari
Browse files
Options
Downloads
Patches
Plain Diff
debian: Upgrade LLVM to 15
Necessary for wasm. See
ghc#22128
.
parent
bf53ee47
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!97
debian: Install emscripten
Pipeline
#56595
failed
2 years ago
Stage: prepare
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
images/debian.dhall
+18
-9
18 additions, 9 deletions
images/debian.dhall
with
18 additions
and
9 deletions
images/debian.dhall
+
18
−
9
View file @
4c9b1b71
...
...
@@ -16,6 +16,15 @@ let
Emscripten = ../components/Emscripten.dhall
let
Image = ../Image.dhall
let
llvmFromUpstream = \(version: Text) ->
Llvm.Source.FromDistro
[ "apt-get update"
, "apt-get install -y lsb-release wget software-properties-common gnupg"
, "wget https://apt.llvm.org/llvm.sh"
, "bash ./llvm.sh ${version}"
, "rm llvm.sh"
]
let
docker_base_url: Text = "registry.gitlab.haskell.org/ghc/ci-images"
...
...
@@ -196,7 +205,7 @@ let debian11Images: List Image.Type =
, runnerTags = [ "x86_64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "x86_64-linux-gnu-ubuntu-16.04" })
, bootstrapGhc = { version = "9.2.2", triple = "x86_64-deb10-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages =
ubuntuBuildDepends
...
...
@@ -211,7 +220,7 @@ let debian11Images: List Image.Type =
, runnerTags = [ "armv7-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "armv7a-linux-gnueabihf" })
, bootstrapGhc = { version = "9.2.2", triple = "armv7-deb10-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "armv7a-linux-gnueabihf" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = (Cabal.Type.FromBindist "https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.2.0/cabal-install-3.6.2.0-armv7-linux-deb10.tar.xz")
, extraPackages = [ "libnuma-dev" ] # ubuntuBuildDepends
, withStack = False
...
...
@@ -222,7 +231,7 @@ let debian11Images: List Image.Type =
, runnerTags = [ "aarch64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1" , triple = "aarch64-linux-gnu" })
, bootstrapGhc = { version = "9.2.2", triple = "aarch64-deb10-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "aarch64-linux-gnu" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "aarch64-linux-deb10" }
, extraPackages = [ "libnuma-dev" ] : List Text
, withStack = False
...
...
@@ -236,7 +245,7 @@ let debian10Images: List Image.Type =
, runnerTags = [ "aarch64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1" , triple = "aarch64-linux-gnu" })
, bootstrapGhc = { version = "9.2.2", triple = "aarch64-deb10-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "aarch64-linux-gnu" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "aarch64-linux-deb10" }
, extraPackages = [ "libnuma-dev" ] : List Text
, withStack = False
...
...
@@ -247,7 +256,7 @@ let debian10Images: List Image.Type =
, runnerTags = [ "armv7-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "armv7a-linux-gnueabihf" })
, bootstrapGhc = { version = "9.2.2", triple = "armv7-deb10-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "armv7a-linux-gnueabihf" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = (Cabal.Type.FromBindist "https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.2.0/cabal-install-3.6.2.0-armv7-linux-deb10.tar.xz")
, extraPackages = [ "libnuma-dev", "lld" ] # debianBuildDepends
, withStack = False
...
...
@@ -273,7 +282,7 @@ let debian10Images: List Image.Type =
, runnerTags = [ "x86_64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "x86_64-linux-gnu-ubuntu-16.04" })
, bootstrapGhc = { version = "9.2.2", triple = "x86_64-deb10-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages =
debianBuildDepends
...
...
@@ -287,7 +296,7 @@ let debian10Images: List Image.Type =
, runnerTags = [ "x86_64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "x86_64-linux-gnu-ubuntu-16.04" })
, bootstrapGhc = { version = "9.0.2", triple = "x86_64-deb10-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages =
debianBuildDepends
...
...
@@ -304,7 +313,7 @@ let debian9Images: List Image.Type =
, runnerTags = [ "x86_64-linux" ]
, bootstrapLlvm = None Llvm.Source
, bootstrapGhc = { version = "9.2.2", triple = "x86_64-deb9-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "10.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages = debianBuildDepends : List Text
}
...
...
@@ -328,7 +337,7 @@ let ubuntuImages: List Image.Type =
, runnerTags = [ "x86_64-linux" ]
, bootstrapLlvm = None Llvm.Source
, bootstrapGhc = { version = "9.2.2", triple = "x86_64-deb9-linux" }
, llvm = Some (
L
lvm
.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" }
)
, llvm = Some (
l
lvm
FromUpstream "15"
)
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages = ubuntuBuildDepends
}
...
...
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