Skip to content
Snippets Groups Projects

Add debian 12 and updated fedora images

Merged Matthew Pickering requested to merge wip/update-deb-fedora-images into master
2 files
+ 53
1
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 31
1
@@ -298,6 +298,36 @@ let debian11Images: List Image.Type =
}
]
let debian12Images: List Image.Type =
[ DebianImage.toDocker DebianImage::
{ name = "x86_64-linux-deb12"
, fromImage = "amd64/debian:bookworm"
, runnerTags = [ "x86_64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "15.0.6", triple = "x86_64-linux-gnu-ubuntu-18.04" })
, bootstrapGhc = { version = "9.4.3", triple = "x86_64-deb10-linux" }
, llvm = Some (Llvm.Source.FromBindist { version = "15.0.6" , triple = "x86_64-linux-gnu-ubuntu-18.04" })
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
, extraPackages =
ubuntuBuildDepends
-- For cross-compilation testing
# [ "crossbuild-essential-arm64", "crossbuild-essential-s390x", "qemu-user" ]
# [ "libnuma-dev" ]
, withEMSDK = False
}
, DebianImage.toDocker DebianImage::
{ name = "aarch64-linux-deb12"
, fromImage = "arm64v8/debian:bookworm"
, runnerTags = [ "aarch64-linux" ]
, bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "15.0.6" , triple = "aarch64-linux-gnu" })
, bootstrapGhc = { version = "9.4.3", triple = "aarch64-deb10-linux" }
, llvm = Some (Llvm.Source.FromBindist { version = "15.0.6" , triple = "aarch64-linux-gnu" })
, cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "aarch64-linux-deb10" }
, extraPackages = [ "libnuma-dev" ] : List Text
, withStack = False
}
]
let debian10Images: List Image.Type =
[ DebianImage.toDocker DebianImage::
{ name = "aarch64-linux-deb10"
@@ -459,6 +489,6 @@ let linterImages: List Image.Type =
]
let allImages: List Image.Type =
linterImages # debian11Images # debian10Images # debian9Images # ubuntuImages
linterImages # debian12Images # debian11Images # debian10Images # debian9Images # ubuntuImages
in allImages
Loading