forked from M-Labs/nix-scripts
nixbld: unbreak hydra sysbuild
This commit is contained in:
parent
088403cf6f
commit
596f4cf4b9
|
@ -378,7 +378,7 @@ in
|
||||||
nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
|
nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
|
||||||
firmwareLinuxNonfree = super.callPackage ./firmware-linux-nonfree.nix {};
|
firmwareLinuxNonfree = super.callPackage ./firmware-linux-nonfree.nix {};
|
||||||
hydra-unstable = super.hydra-unstable.overrideAttrs(oa: {
|
hydra-unstable = super.hydra-unstable.overrideAttrs(oa: {
|
||||||
patches = oa.patches or [] ++ [ ./hydra-conda.patch ./hydra-retry.patch ];
|
patches = oa.patches or [] ++ [ ./hydra-conda.patch ./hydra-retry.patch ./hydra-unbreak-sysbuild.patch ];
|
||||||
hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ];
|
hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ];
|
||||||
});
|
});
|
||||||
matterbridge = super.matterbridge.overrideAttrs(oa: {
|
matterbridge = super.matterbridge.overrideAttrs(oa: {
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm
|
||||||
|
index d4334300..014d07ce 100644
|
||||||
|
--- a/src/lib/Hydra/Schema/Builds.pm
|
||||||
|
+++ b/src/lib/Hydra/Schema/Builds.pm
|
||||||
|
@@ -608,6 +608,7 @@ makeQueries('', "");
|
||||||
|
makeQueries('ForProject', "and project = ?");
|
||||||
|
makeQueries('ForJobset', "and jobset_id = ?");
|
||||||
|
makeQueries('ForJob', "and jobset_id = ? and job = ?");
|
||||||
|
+makeQueries('ForJobName', "and jobset_id = (select id from jobsets j where j.name = ?) and job = ?");
|
||||||
|
|
||||||
|
|
||||||
|
my %hint = (
|
||||||
|
diff --git a/src/script/hydra-eval-jobset b/src/script/hydra-eval-jobset
|
||||||
|
index ea336bfc..2f208418 100755
|
||||||
|
--- a/src/script/hydra-eval-jobset
|
||||||
|
+++ b/src/script/hydra-eval-jobset
|
||||||
|
@@ -142,7 +142,7 @@ sub fetchInputSystemBuild {
|
||||||
|
$projectName ||= $project->name;
|
||||||
|
$jobsetName ||= $jobset->name;
|
||||||
|
|
||||||
|
- my @latestBuilds = $db->resultset('LatestSucceededForJob')
|
||||||
|
+ my @latestBuilds = $db->resultset('LatestSucceededForJobName')
|
||||||
|
->search({}, {bind => [$jobsetName, $jobName]});
|
||||||
|
|
||||||
|
my @validBuilds = ();
|
Loading…
Reference in New Issue