Skip to content
Snippets Groups Projects
Commit 4c9b1b71 authored by Ben Gamari's avatar Ben Gamari :turtle:
Browse files

debian: Upgrade LLVM to 15

Necessary for wasm. See ghc#22128.
parent bf53ee47
No related branches found
No related tags found
1 merge request!97debian: Install emscripten
Pipeline #56595 failed
......@@ -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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "armv7a-linux-gnueabihf" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "aarch64-linux-gnu" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "aarch64-linux-gnu" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "armv7a-linux-gnueabihf" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "10.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
, llvm = Some (llvmFromUpstream "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 (Llvm.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
, llvm = Some (llvmFromUpstream "15")
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages = ubuntuBuildDepends
}
......
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