Verified Commit fb77ecaa authored by Julian Ospald's avatar Julian Ospald 🍵
Browse files

Update debian to bullseye

parent f45eaa3f
Pipeline #43056 failed with stages
in 44 seconds
......@@ -69,9 +69,12 @@ let
, "lmodern"
]
let debianBuildDepends: List Text =
let debianStretchBuildDepends: List Text =
[ "texlive-generic-extra" ]
let debianBullseyeBuildDepends: List Text =
[ "texlive-plain-generic" ]
let ubuntuBuildDepends: List Text =
[ "texlive-plain-generic" ]
......@@ -187,8 +190,8 @@ let
let images: List Image.Type =
[ DebianImage.toDocker DebianImage::
{ name = "aarch64-linux-deb10"
, fromImage = "arm64v8/debian:buster"
{ name = "aarch64-linux-deb11"
, fromImage = "arm64v8/debian:bullseye"
, runnerTags = [ "aarch64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1" , triple = "aarch64-linux-gnu" })
, bootstrapGhc = { version = "8.10.7", triple = "aarch64-deb10-linux" }
......@@ -199,14 +202,14 @@ let images: List Image.Type =
}
, DebianImage.toDocker DebianImage::
{ name = "armv7-linux-deb10"
, fromImage = "arm32v7/debian:buster"
{ name = "armv7-linux-deb11"
, fromImage = "arm32v7/debian:bullseye"
, runnerTags = [ "armv7-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "armv7a-linux-gnueabihf" })
, bootstrapGhc = { version = "8.10.7", triple = "armv7-deb10-linux" }
, llvm = Some (Llvm.Source.FromBindist { version = "11.0.1" , triple = "armv7a-linux-gnueabihf" })
, 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" ] # debianBuildDepends
, extraPackages = [ "libnuma-dev" ] # debianBullseyeBuildDepends
, withStack = False
}
......@@ -218,14 +221,14 @@ let images: List Image.Type =
, bootstrapGhc = { version = "8.10.7", triple = "i386-deb9-linux" }
, llvm = None Llvm.Source
, cabalSource = (Cabal.Type.FromBindist "https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.2.0/cabal-install-3.6.2.0-i386-linux-alpine.tar.xz")
, extraPackages = debianBuildDepends # [ "cabal-install" ] : List Text
, extraPackages = debianStretchBuildDepends # [ "cabal-install" ] : List Text
, withStack = False
}
-- N.B. Need bindist for deb10 i386
--, DebianImage.toDocker DebianImage::
-- { name = "i386-linux-deb10"
-- , fromImage = "i386/debian:buster"
-- , fromImage = "i386/debian:bullseye"
-- , runnerTags = [ "x86_64-linux" ]
-- , bootstrapLlvm = None Llvm.Source
-- , bootstrapGhc = { version = "8.10.4", triple = "i386-deb10-linux" }
......@@ -239,15 +242,15 @@ let images: List Image.Type =
-- }
, DebianImage.toDocker DebianImage::
{ name = "x86_64-linux-deb10"
, fromImage = "amd64/debian:buster"
{ name = "x86_64-linux-deb11"
, fromImage = "amd64/debian:bullseye"
, runnerTags = [ "x86_64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "x86_64-linux-gnu-ubuntu-16.04" })
, bootstrapGhc = { version = "8.10.7", triple = "x86_64-deb10-linux" }
, llvm = Some (Llvm.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages =
debianBuildDepends
debianBullseyeBuildDepends
-- For cross-compilation testing
# ["crossbuild-essential-arm64"]
# [ "libnuma-dev" ]
......@@ -261,7 +264,7 @@ let images: List Image.Type =
, bootstrapGhc = { version = "8.10.7", triple = "x86_64-deb9-linux" }
, llvm = Some (Llvm.Source.FromBindist { version = "10.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
, cabalSource = Cabal.fromUpstreamBindist { version = "3.2.0.0", triple = "x86_64-unknown-linux" }
, extraPackages = debianBuildDepends : List Text
, extraPackages = debianStretchBuildDepends : List Text
}
, DebianImage.toDocker DebianImage::
......@@ -279,7 +282,7 @@ let images: List Image.Type =
{ name = "linters"
, runnerTags = [ "x86_64-linux" ]
, jobStage = "build-derived"
, needs = [ "x86_64-linux-deb10" ]
, needs = [ "x86_64-linux-deb11" ]
, image =
let installMypy: CF.Type =
installPackages [ "python3-pip" ]
......@@ -301,7 +304,7 @@ let images: List Image.Type =
let installShellcheck: CF.Type =
installPackages [ "shellcheck" ]
in
CF.from "${docker_base_url}/x86_64-linux-deb10:latest"
CF.from "${docker_base_url}/x86_64-linux-deb11:latest"
# [ CF.Statement.User "root" ]
# installMypy
# installShellcheck
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment