release-cross: Use the same genAttrs logic for testOnCross
as testOn
Eventually we'll want to test cross-compiling *from* various platforms. For now, its good to be consistent.
This commit is contained in:
parent
74753d01f8
commit
db0dbd0b81
|
@ -1,4 +1,4 @@
|
|||
with import ./release-lib.nix { supportedSystems = []; };
|
||||
with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; };
|
||||
let
|
||||
nativePlatforms = linux;
|
||||
|
||||
|
|
|
@ -59,10 +59,9 @@ rec {
|
|||
/* Similar to the testOn function, but with an additional
|
||||
'crossSystem' parameter for allPackages, defining the target
|
||||
platform for cross builds. */
|
||||
testOnCross = crossSystem: systems: f: {system ? builtins.currentSystem}:
|
||||
if elem system systems
|
||||
then f (allPackages { inherit system crossSystem; })
|
||||
else {};
|
||||
testOnCross = crossSystem: systems: f: genAttrs
|
||||
(filter (x: elem x supportedSystems) systems)
|
||||
(system: hydraJob' (f (allPackages { inherit system crossSystem; })));
|
||||
|
||||
|
||||
/* Given a nested set where the leaf nodes are lists of platforms,
|
||||
|
|
Loading…
Reference in a new issue