grahamc/hydra2 - Change IMA3HWYCJ6WMFVGSQILZWSWO7QXDVDTWAQFNCKI4QO5JL3QX4ZZAC

Fix link to cached build log

Fixes #462.

Created by Eelco Dolstra on April 11, 2017

IMA3HWYCJ6WMFVGSQILZWSWO7QXDVDTWAQFNCKI4QO5JL3QX4ZZAC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Controller/Build.pm at line 76 [5.1]

∅:D[3.210] → [4.0:88]

∅:D[6.391] → [4.0:88]

∅:D[7.2417] → [4.0:88]

B:BD[8.188] → [4.0:88]

        $c->stash->{cachedBuild} = $cachedBuildStep->build if defined $cachedBuildStep;

[6.391]

[5.1105]

        if (defined $cachedBuildStep) {
            $c->stash->{cachedBuild} = $cachedBuildStep->build;
            $c->stash->{cachedBuildStep} = $cachedBuildStep;
        }

Replacement in src/root/build.tt at line 140 [11.7350]

B:BD[9.68] → [10.2134:2229]

  [% IF steps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]

[9.68]

[12.1968]

  [% IF steps.size() > 0 %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]

Replacement in src/root/build.tt at line 233 [11.7350]

B:BD[13.6532] → [2.2279:2608]

                  <a class="btn btn-mini" href="[% c.uri_for('/build' actualBuild.id 'log') %]">pretty</a>
                  <a class="btn btn-mini" href="[% c.uri_for('/build' actualBuild.id 'log' 'raw') %]">raw</a>
                  <a class="btn btn-mini" href="[% c.uri_for('/build' actualBuild.id 'log' 'tail') %]">tail</a>

[13.6532]

[13.6622]

                  [% actualLog = cachedBuildStep ? c.uri_for('/build' cachedBuild.id 'nixlog' cachedBuildStep.stepnr) : c.uri_for('/build' build.id 'log') %]
                  <a class="btn btn-mini" href="[%actualLog%]">pretty</a>
                  <a class="btn btn-mini" href="[%actualLog%]/raw">raw</a>
                  <a class="btn btn-mini" href="[%actualLog%]/tail">tail</a>