JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release-haskell.nix: add aarch64-darwin

Browse Source 
nixpkgs:trunk also builds aarch64-darwin these days, so this forces our
hand a little bit. We can still refuse to care about failures _too_
much, but at least we will stop merging as big a rebuilds as we are
currently.
This commit is contained in:
sternenseemann 2023-03-10 14:43:00 +01:00
parent bf7ad8aa57
commit 100d887968
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/scripts/haskell/hydra-report.hs
View File

@ -328,6 +328,7 @@ platformIcon (Platform x) = case x of
"x86_64-linux" -> ":penguin:" "x86_64-linux" -> ":penguin:"
"aarch64-linux" -> ":iphone:" "aarch64-linux" -> ":iphone:"
"x86_64-darwin" -> ":apple:" "x86_64-darwin" -> ":apple:"
"aarch64-darwin" -> ":green_apple:"
_ -> x _ -> x
data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord)
@ -488,7 +489,8 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps =
if' (isNothing maintainedJob) "No `maintained` job found." <> if' (isNothing maintainedJob) "No `maintained` job found." <>
if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <>
if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <>
if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <>
if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin."
if' p e = if p then [e] else mempty if' p e = if p then [e] else mempty
outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m
maintainedJob = Map.lookup "maintained" summary maintainedJob = Map.lookup "maintained" summary

2
pkgs/top-level/release-haskell.nix
View File

@ -9,7 +9,7 @@
$ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
*/ */
{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }: { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] }:
let let