ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into flake

Browse Source
This commit is contained in:
Eelco Dolstra 2019-09-24 19:03:18 +02:00
commit 0ccf36ca3b
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -104,6 +104,7 @@
SetScalar SetScalar
Starman Starman
SysHostnameLong SysHostnameLong
TermSizeAny
TestMore TestMore
TextDiff TextDiff
TextTable TextTable

2
hydra-module.nix
View File

@ -166,7 +166,7 @@ in
buildMachinesFiles = mkOption { buildMachinesFiles = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = [ "/etc/nix/machines" ]; default = optional (config.nix.buildMachines != []) "/etc/nix/machines";
example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
description = "List of files containing build machines."; description = "List of files containing build machines.";
}; };

9
src/lib/Hydra/Controller/API.pm
View File

@ -81,7 +81,14 @@ sub jobsetToHash {
nrscheduled => $jobset->get_column("nrscheduled"), nrscheduled => $jobset->get_column("nrscheduled"),
nrsucceeded => $jobset->get_column("nrsucceeded"), nrsucceeded => $jobset->get_column("nrsucceeded"),
nrfailed => $jobset->get_column("nrfailed"), nrfailed => $jobset->get_column("nrfailed"),
nrtotal => $jobset->get_column("nrtotal") nrtotal => $jobset->get_column("nrtotal"),
lastcheckedtime => $jobset->lastcheckedtime,
starttime => $jobset->starttime,
checkinterval => $jobset->checkinterval,
triggertime => $jobset->triggertime,
fetcherrormsg => $jobset->fetcherrormsg,
errortime => $jobset->errortime,
haserrormsg => $jobset->errormsg eq "" ? JSON::false : JSON::true
}; };
} }

4
src/lib/Hydra/Schema/Builds.pm
View File

@ -544,8 +544,8 @@ __PACKAGE__->many_to_many(
); );
# Created by DBIx::Class::Schema::Loader v0.07049 @ 2019-05-10 22:30:12 # Created by DBIx::Class::Schema::Loader v0.07049 @ 2019-08-19 16:12:37
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YK8Fc+37UAcL0u6ziOc5xQ # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VjYbAQwv4THW2VfWQ5ajYQ
__PACKAGE__->has_many( __PACKAGE__->has_many(
"dependents", "dependents",