Skip to content

Commit 1c43f45

Browse files
authored
Merge pull request #1459 from dermetfan/fix-1429-backport-nix-2.25
(backport to nix-2.25) hydra-eval-jobset: do not wait on n-e-j inside transaction
2 parents ea09952 + 6d92b79 commit 1c43f45

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/script/hydra-eval-jobset

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,9 @@ sub checkJobsetWrapped {
773773
my $jobsetChanged = 0;
774774
my %buildMap;
775775

776+
my @jobs;
777+
push @jobs, $_ while defined($_ = $jobsIter->());
778+
776779
$db->txn_do(sub {
777780
my $prevEval = getPrevJobsetEval($db, $jobset, 1);
778781

@@ -796,7 +799,7 @@ sub checkJobsetWrapped {
796799

797800
my @jobsWithConstituents;
798801

799-
while (defined(my $job = $jobsIter->())) {
802+
foreach my $job (@jobs) {
800803
if ($jobsetsJobset) {
801804
die "The .jobsets jobset must only have a single job named 'jobsets'"
802805
unless $job->{attr} eq "jobsets";

0 commit comments

Comments
 (0)