Skip to content

Commit e02d5a8

Browse files
authored
Smaller required jobs (#990)
We still seem to be getting some OOM errors. This is likely to be because some of the required jobs are still very large (with multiple cross compilation target platforms). Hopefully breaking these out will help.
1 parent f6bc2f7 commit e02d5a8

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

release.nix

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@ let
2626
let nixpkgsJobs = allJobs.${nixpkgsVer};
2727
in lib.concatMap (compiler-nix-name:
2828
let ghcJobs = nixpkgsJobs.${compiler-nix-name};
29-
in builtins.map (platform: {
30-
name = "required-${nixpkgsVer}-${compiler-nix-name}-${platform}";
31-
value = genericPkgs.releaseTools.aggregate {
32-
name = "haskell.nix-${nixpkgsVer}-${compiler-nix-name}-${platform}";
33-
meta.description = "All ${nixpkgsVer} ${compiler-nix-name} ${platform} jobs";
34-
constituents = lib.collect (d: lib.isDerivation d) ghcJobs.${platform};
35-
};
36-
}) (names ghcJobs)
29+
in builtins.concatMap (platform:
30+
let platformJobs = ghcJobs.${platform};
31+
in builtins.map (crossPlatform: {
32+
name = "required-${nixpkgsVer}-${compiler-nix-name}-${platform}-${crossPlatform}";
33+
value = genericPkgs.releaseTools.aggregate {
34+
name = "haskell.nix-${nixpkgsVer}-${compiler-nix-name}-${platform}-${crossPlatform}";
35+
meta.description = "All ${nixpkgsVer} ${compiler-nix-name} ${platform} ${crossPlatform} jobs";
36+
constituents = lib.collect (d: lib.isDerivation d) platformJobs.${crossPlatform};
37+
};
38+
}) (names platformJobs)
39+
) (names ghcJobs)
3740
) (names nixpkgsJobs)
3841
) (names allJobs));
3942
in latestJobs // requiredJobs // {

0 commit comments

Comments
 (0)