Skip to content

improve(mcl/{ci_matrix,deploy_spec}): Minor improvements and fixes #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 23, 2025
Merged

improve(mcl/{ci_matrix,deploy_spec}): Minor improvements and fixes #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43c73fd
fix(mcl/nixEvalJobs): Properly filter useless warnings
PetarKirov Jan 23, 2025
171f1e0
improve(mcl/json): Slightly improve the error format
PetarKirov Jan 23, 2025
823ae9c
fix(mcl/deploy-spec): Handle 0 agents case and simplify logging
PetarKirov Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/mcl/src/src/mcl/commands/ci_matrix.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ Package[] nixEvalJobs(string flakeAttrPrefix, string cachixUrl, bool doCheck = t
})(false);

const stderrLogs = pipes.stderr.byLine
.filter!(line => !uselessWarnings.canFind(line))
.filter!(line => !uselessWarnings.any!(w => line.canFind(w)))
.join("\n");

logWarning(stderrLogs);
Expand Down
18 changes: 11 additions & 7 deletions packages/mcl/src/src/mcl/commands/deploy_spec.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export void deploy_spec()
{
const deploySpecFile = resultDir.buildPath("cachix-deploy-spec.json");

DeploySpec spec;

if (!exists(deploySpecFile))
{
auto nixosConfigs = flakeAttr("legacyPackages", SupportedSystem.x86_64_linux, "bareMetalMachines")
Expand All @@ -39,19 +41,21 @@ export void deploy_spec()
if (!configsMissingFromCachix.empty)
throw new Exception("Some Nixos configurations are not in cachix. Please cache them first.");

auto spec = nixosConfigs.createMachineDeploySpec().toJSON;

infof("Deploy spec: %s", spec.toPrettyString(JSONOptions.doNotEscapeSlashes));

writeFile(deploySpecFile, spec.toString());
spec = nixosConfigs.createMachineDeploySpec();
writeFile(deploySpecFile, spec.toJSON.toPrettyString(JSONOptions.doNotEscapeSlashes));
}
else
{
warningf("Reusing existing deploy spec at:\n'%s'", deploySpecFile.bold);

warningf("\n---\n%s\n---", deploySpecFile.tryDeserializeFromJsonFile!DeploySpec);
spec = deploySpecFile.tryDeserializeFromJsonFile!DeploySpec;
}

infof("\n---\n%s\n---", spec);
infof("%s machines will be deployed.", spec.agents.length);

if (!spec.agents.length)
return;

spawnProcessInline([
"cachix", "deploy", "activate", deploySpecFile, "--async"
]);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcl/src/src/mcl/utils/json.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,5 +328,5 @@ T tryDeserializeFromJsonFile(T)(string path)

return json
.fromJSON!T()
.tryGet("Error deserializing %s. JSON: %s".format(T.stringof.bold, json.toPrettyString().bold));
.tryGet("Error deserializing %s. JSON: \n%s".format(T.stringof.bold, json.toPrettyString().bold));
}