Skip to content

Commit

Permalink
Try just adding the attributes from ci.nix and see if that works
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelpj committed Feb 27, 2020
1 parent a6004e3 commit 020819d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions release.nix
Expand Up @@ -25,6 +25,7 @@ in

# The revision passed in by Hydra, if there is one
let rev = if builtins.isNull plutus then null else plutus.rev;
ci = import ./ci.nix;

in with (import (fixedNixpkgs + "/pkgs/top-level/release-lib.nix") {
inherit supportedSystems scrubJobs;
Expand All @@ -41,7 +42,7 @@ let
# Only recurse into attributes marked with `recurseForDerivations`.
# This avoids us looking to deeply (or even recusing infinitely)
# This mark is usually added with `pkgs.recurseIntoAttrs`
# https://github.com/NixOS/nixpkgs/blob/fd98b29b293f868636fa2f6cf54d7df334bdd3d9/pkgs/top-level/all-packages.nix#L65-L67
# https://github.com/NixOS/nixpkgs/blob/fd98b29b293f868636fa2f6cf54d7df334bdd3d9/pkgs/top-level/all-packages.nix#L65-L67
(x: x.recurseForDerivations or false)
# Replace each node in the tree with the provided list of systems
# or an empty list if the node is not a derivation.
Expand Down Expand Up @@ -76,7 +77,7 @@ let
dev.scripts = lib.mapAttrs (n: _: if n == "updateClientDeps" then linux else supportedSystems) packageSet.dev.scripts;
};

testJobsets = mapTestOn systemMapping;
testJobsets = mapTestOn systemMapping // ci;

# Recursively collect all jobs (derivations) in a jobset
allJobs = jobset: lib.collect lib.isDerivation jobset;
Expand Down

0 comments on commit 020819d

Please sign in to comment.