1
0
Fork 0

nixbld: Hydra sysbuild patch merged upstream

https://github.com/NixOS/hydra/issues/784
This commit is contained in:
Sebastien Bourdeauducq 2021-04-24 17:07:46 +08:00
parent 43005f0f65
commit 536a134b32
2 changed files with 0 additions and 26 deletions

View File

@ -447,7 +447,6 @@ in
hydra-unstable = super.hydra-unstable.overrideAttrs(oa: { hydra-unstable = super.hydra-unstable.overrideAttrs(oa: {
patches = oa.patches or [] ++ [ patches = oa.patches or [] ++ [
./hydra-conda.patch ./hydra-conda.patch
./hydra-unbreak-sysbuild.patch
./hydra-restrictdist.patch ./hydra-restrictdist.patch
./hydra-giteastatus.patch ./hydra-giteastatus.patch
]; ];

View File

@ -1,25 +0,0 @@
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 = ();