diff --git a/src/root/build.tt b/src/root/build.tt index b61c3eec..c445c72b 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -184,25 +184,25 @@ [% INCLUDE renderBuildSteps type="Failed" %] [% END %] - [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %] -

Changes

-

- Build [% INCLUDE renderFullBuildLink build=firstBrokenBuild %] is the first build failure after the previous successful build of this job. The changes that might have caused the failure are: -

- [% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=firstBrokenBuild %] -
-

- [% END %] - [% IF build.resultInfo.buildstatus != 0 && prevSuccessfulBuild %] -

Changes

-

- The previous successful build of this job was [% INCLUDE renderFullBuildLink build=prevSuccessfulBuild %]. The - following changes were made since: -

- [% INCLUDE renderInputDiff build2=build , build1=prevSuccessfulBuild %] -
-

+

Changes

+ + + + [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %][% END %] + + + + + [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %][% END %] + + + + + [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %][% END %] + + +
Last successful buildFirst broken buildCurrent build
[% INCLUDE renderBuildStatusIcon build=prevSuccessfulBuild size=32 %] [% INCLUDE renderFullBuildLink build=prevSuccessfulBuild %][% INCLUDE renderBuildStatusIcon build=firstBrokenBuild size=32 %] [% INCLUDE renderFullBuildLink build=firstBrokenBuild %][% INCLUDE renderBuildStatusIcon build=build size=32 %] [% INCLUDE renderFullBuildLink build=build %]
[% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=firstBrokenBuild %][% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=build %]
[% END %] [% IF build.resultInfo.errormsg && build.resultInfo.buildstatus != 5 %] diff --git a/src/root/common.tt b/src/root/common.tt index b6580e9a..e2eba001 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -284,6 +284,16 @@ [% END %] [% END %] +[% BLOCK renderShortInputValue %] + [% IF input.type == "build" || input.type == "sysbuild" %] + [% build.id %] + [% ELSIF input.type == "string" || input.type == "boolean" %] + "[% input.value %]" + [% ELSE %] + [% input.uri %][% IF input.revision %] (r. [% input.revision %])[% END %] + [% END %] +[% END %] + [% BLOCK renderDiffUri; %] [% nouri = 1 %] [% FOREACH m IN mappers %] @@ -311,14 +321,20 @@ [% IF bi1.name == bi2.name %] [% IF bi1.type == bi2.type %] [% IF bi1.value != bi2.value || bi1.uri != bi2.uri %] - [% bi1.name %][% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %] + [% bi1.name %][% INCLUDE renderShortInputValue input=bi1 %] to [% INCLUDE renderShortInputValue input=bi2 %] [% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %] + [% IF bi1.type == "git" %] - [% bi1.name %][% INCLUDE renderDiffUri contents=('Revision changed from ' _ bi1.revision _ ' to ' _ bi2.revision) %] + [% bi1.name %][% INCLUDE renderDiffUri contents=(bi1.revision.substr(0, 6) _ ' to ' _ bi2.revision.substr(0, 6)) %] + [% ELSE %] + + [% bi1.name %][% INCLUDE renderDiffUri contents=(bi1.revision _ ' to ' _ bi2.revision) %] + + [% END %] [% ELSIF bi1.dependency.id != bi2.dependency.id || bi1.path != bi2.path %] - [% bi1.name %][% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %] + [% bi1.name %][% INCLUDE renderShortInputValue input=bi1 %] to [% INCLUDE renderShortInputValue input=bi2 %]

[% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency, nestedDiff=1 %] @@ -358,4 +374,10 @@ [% END %] +[% END %] + +[% BLOCK buildsGraph %] + + + [% END %]