mirror of
https://github.com/NixOS/nix.git
synced 2024-10-30 05:40:52 +00:00
Merge pull request #4878 from NixOS/flake-check-keep-going
Let nix flake check keep going when keep-going is set
This commit is contained in:
commit
cc9aa8d4b1
@ -22,6 +22,10 @@ This command verifies that the flake specified by flake reference
|
||||
that the derivations specified by the flake's `checks` output can be
|
||||
built successfully.
|
||||
|
||||
If the `keep-going` option is set to `true`, Nix will keep evaluating as much
|
||||
as it can and report the errors as it encounters them. Otherwise it will stop
|
||||
at the first error.
|
||||
|
||||
# Evaluation checks
|
||||
|
||||
The following flake output attributes must be derivations:
|
||||
|
@ -272,25 +272,40 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
auto state = getEvalState();
|
||||
auto flake = lockFlake();
|
||||
|
||||
bool hasErrors = false;
|
||||
auto reportError = [&](const Error & e) {
|
||||
try {
|
||||
throw e;
|
||||
} catch (Error & e) {
|
||||
if (settings.keepGoing) {
|
||||
ignoreException();
|
||||
hasErrors = true;
|
||||
}
|
||||
else
|
||||
throw;
|
||||
}
|
||||
};
|
||||
|
||||
// FIXME: rewrite to use EvalCache.
|
||||
|
||||
auto checkSystemName = [&](const std::string & system, const Pos & pos) {
|
||||
// FIXME: what's the format of "system"?
|
||||
if (system.find('-') == std::string::npos)
|
||||
throw Error("'%s' is not a valid system type, at %s", system, pos);
|
||||
reportError(Error("'%s' is not a valid system type, at %s", system, pos));
|
||||
};
|
||||
|
||||
auto checkDerivation = [&](const std::string & attrPath, Value & v, const Pos & pos) {
|
||||
auto checkDerivation = [&](const std::string & attrPath, Value & v, const Pos & pos) -> std::optional<StorePath> {
|
||||
try {
|
||||
auto drvInfo = getDerivation(*state, v, false);
|
||||
if (!drvInfo)
|
||||
throw Error("flake attribute '%s' is not a derivation", attrPath);
|
||||
// FIXME: check meta attributes
|
||||
return store->parseStorePath(drvInfo->queryDrvPath());
|
||||
return std::make_optional(store->parseStorePath(drvInfo->queryDrvPath()));
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the derivation '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
return std::nullopt;
|
||||
};
|
||||
|
||||
std::vector<DerivedPath> drvPaths;
|
||||
@ -307,7 +322,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
#endif
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the app definition '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
};
|
||||
|
||||
@ -323,7 +338,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
// evaluate the overlay.
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the overlay '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
};
|
||||
|
||||
@ -347,7 +362,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
// check the module.
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the NixOS module '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
};
|
||||
|
||||
@ -369,7 +384,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the Hydra jobset '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
};
|
||||
|
||||
@ -384,7 +399,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
throw Error("attribute 'config.system.build.toplevel' is not a derivation");
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the NixOS configuration '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
};
|
||||
|
||||
@ -418,7 +433,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
}
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the template '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
};
|
||||
|
||||
@ -433,7 +448,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
throw Error("bundler must take formal arguments 'program' and 'system'");
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking the template '%s'", attrPath));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
};
|
||||
|
||||
@ -461,8 +476,8 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
auto drvPath = checkDerivation(
|
||||
fmt("%s.%s.%s", name, attr.name, attr2.name),
|
||||
*attr2.value, *attr2.pos);
|
||||
if ((std::string) attr.name == settings.thisSystem.get())
|
||||
drvPaths.push_back(DerivedPath::Built{drvPath});
|
||||
if (drvPath && (std::string) attr.name == settings.thisSystem.get())
|
||||
drvPaths.push_back(DerivedPath::Built{*drvPath});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -574,7 +589,7 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
|
||||
} catch (Error & e) {
|
||||
e.addTrace(pos, hintfmt("while checking flake output '%s'", name));
|
||||
throw;
|
||||
reportError(e);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -583,6 +598,8 @@ struct CmdFlakeCheck : FlakeCommand
|
||||
Activity act(*logger, lvlInfo, actUnknown, "running flake checks");
|
||||
store->buildPaths(drvPaths);
|
||||
}
|
||||
if (hasErrors)
|
||||
throw Error("Some errors were encountered during the evaluation");
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -535,6 +535,21 @@ EOF
|
||||
|
||||
(! nix flake check $flake3Dir)
|
||||
|
||||
cat > $flake3Dir/flake.nix <<EOF
|
||||
{
|
||||
outputs = { flake1, self }: {
|
||||
defaultPackage = {
|
||||
system-1 = "foo";
|
||||
system-2 = "bar";
|
||||
};
|
||||
};
|
||||
}
|
||||
EOF
|
||||
|
||||
checkRes=$(nix flake check --keep-going $flake3Dir 2>&1 && fail "nix flake check should have failed" || true)
|
||||
echo "$checkRes" | grep -q "defaultPackage.system-1"
|
||||
echo "$checkRes" | grep -q "defaultPackage.system-2"
|
||||
|
||||
# Test 'follows' inputs.
|
||||
cat > $flake3Dir/flake.nix <<EOF
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user