diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm index fa968ef3..ef633201 100644 --- a/src/lib/Hydra/Controller/Jobset.pm +++ b/src/lib/Hydra/Controller/Jobset.pm @@ -353,7 +353,7 @@ sub getEvals { # Compute what inputs changed between each eval. my $curInputs = [ $cur->jobsetevalinputs->search( - { uri => { '!=' => undef }, revision => { '!=' => undef }, altNr => 0 }, + { -or => [ -and => [ uri => { '!=' => undef }, revision => { '!=' => undef }], dependency => { '!=' => undef }], altNr => 0 }, { order_by => "name" }) ]; my @changedInputs; my %prevInputsHash; @@ -361,7 +361,8 @@ sub getEvals { foreach my $input (@{$curInputs}) { my $p = $prevInputsHash{$input->name}; push @changedInputs, $input - if !defined $p || $input->revision ne $p->revision || $input->type ne $p->type || $input->uri ne $p->uri; + if !defined $p || $input->revision ne $p->revision || $input->type ne $p->type || $input->uri ne $p->uri || + ( defined $input->dependency && defined $p->dependency && $input->dependency->id ne $p->dependency->id); } $prevInputs = $curInputs; diff --git a/src/root/common.tt b/src/root/common.tt index 1c89a7ff..b160b348 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -246,7 +246,7 @@ [%- ELSIF buildstatus == 2 -%] Dependency failed [%- ELSIF buildstatus == 4 -%] - Failed + Cancelled [%- ELSIF buildstatus == 5 -%] Failed [%- ELSIF buildstatus == 6 -%] @@ -416,13 +416,15 @@ [% END %] -[% BLOCK renderShortRev -%] - [%- IF type == "svn" || type == "svn-checkout" || type == "bzr" || type == "bzr-checkout" -%] +[% BLOCK renderShortEval -%] + [%- IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" -%] r[%- revision -%] - [%- ELSIF type == "git" -%] - [% revision.substr(0, 7) %] + [%- ELSIF input.type == "git" -%] + [% input.revision.substr(0, 7) %] + [%- ELSIF input.type == "build" || input.type == "sysbuild" -%] + [% input.dependency.id %] [%- ELSE -%] - [%- revision -%] + [%- input.revision -%] [%- END -%] [%- END %] @@ -446,7 +448,7 @@ [%- IF e.changedInputs.size > 0 -%] [%- sep=''; FOREACH input IN e.changedInputs -%] - [%- sep %] [% input.name %] → [% INCLUDE renderShortRev type=input.type revision=input.revision %] + [%- sep %] [% input.name %] → [% INCLUDE renderShortEval input=input %] [%- sep=','; END -%] [%- ELSE -%] - diff --git a/src/root/static/images/cancelled_128.png b/src/root/static/images/cancelled_128.png new file mode 100644 index 00000000..1f211309 Binary files /dev/null and b/src/root/static/images/cancelled_128.png differ diff --git a/src/root/static/images/cancelled_16.png b/src/root/static/images/cancelled_16.png new file mode 100644 index 00000000..6b6fca46 Binary files /dev/null and b/src/root/static/images/cancelled_16.png differ diff --git a/src/root/static/images/cancelled_32.png b/src/root/static/images/cancelled_32.png new file mode 100644 index 00000000..1f40160a Binary files /dev/null and b/src/root/static/images/cancelled_32.png differ diff --git a/src/root/static/images/cancelled_64.png b/src/root/static/images/cancelled_64.png new file mode 100644 index 00000000..99d89fe6 Binary files /dev/null and b/src/root/static/images/cancelled_64.png differ