-
-
-
- [% INCLUDE renderBuildStatusIcon size=128, build=build %]
-
-
-
-
- Build ID:
- [% build.id %]
-
- [% IF build.releasename %]
-
- Release name:
- [% HTML.escape(build.releasename) %]
- [% ELSE %]
-
- Nix name:
- [% build.nixname %]
- [% END %]
-
- Status:
-
- [% INCLUDE renderStatus build=build %]
-
-
-
- System:
- [% build.system %]
- [% IF build.finished %]
-
- Duration:
-
- [% IF build.iscachedbuild %]
- (cached[% IF cachedBuild %] from [% INCLUDE renderFullBuildLink build=cachedBuild %][% END %])
- [% ELSE %]
- [% INCLUDE renderDuration duration = build.stoptime - build.starttime %] finished at [% INCLUDE renderDateTime timestamp = build.stoptime %]
- [% END %]
-
-
- [% END %]
- [% IF build.logfile %]
-
- Logfile:
-
- pretty
- raw
- tail
-
-
- [% END %]
-
-
-
-
-
- [% IF c.user_exists && available %]
-
- [% END %]
-
- [% IF build.buildproducts %]
+
+ [% END %]
-
Build products
-
- [% IF !available %]
-
Note: this build is no longer available.
- [% END %]
-
- [% INCLUDE renderProductList latestRoot=['/job' build.project.name build.jobset.name build.job.name 'latest'] %]
-
- [% END %]
+ [% IF build.buildproducts %]
+
+
Build products
+
+ [% IF !available %]
+
Note: this build is no longer available.
+ [% END %]
+
+ [% INCLUDE renderProductList latestRoot=['/job' build.project.name build.jobset.name build.job.name 'latest'] %]
+
+ [% END %]
[% IF !build.finished %]
Running build steps
[% INCLUDE renderBuildSteps type="Running" %]
- [% END %]
+ [% END %]
- [% IF build.finished %]
- [% IF build.buildsteps && build.buildstatus != 0 && build.buildstatus != 6 %]
+ [% IF build.finished %]
+ [% IF build.buildsteps && build.buildstatus != 0 && build.buildstatus != 6 %]
Failed build steps
- [% INCLUDE renderBuildSteps type="Failed" %]
- [% END %]
+ [% INCLUDE renderBuildSteps type="Failed" %]
+ [% END %]
[% IF prevSuccessfulBuild %]
Changes
@@ -192,7 +192,7 @@
[% INCLUDE renderBuildStatusIcon build=prevSuccessfulBuild size=32 %] [% INCLUDE renderFullBuildLink build=prevSuccessfulBuild, hideProjectName=1, hideJobsetName=1 %]
[% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]
[% INCLUDE renderBuildStatusIcon build=firstBrokenBuild size=32 %] [% INCLUDE renderFullBuildLink build=firstBrokenBuild, hideProjectName=1, hideJobsetName=1 %] [% END %]
[% INCLUDE renderBuildStatusIcon build=build size=32 %] [% INCLUDE renderFullBuildLink build=build, hideProjectName=1, hideJobsetName=1 %]
-
+
[% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=firstBrokenBuild %] [% END %]
@@ -201,207 +201,207 @@
[% END %]
- [% IF build.errormsg && build.buildstatus != 5 %]
-
- Nix error output
-
- [% HTML.escape(build.errormsg) -%]
- [% END %]
- [% END %]
- [% IF logtext %]
- Log
-
- [% HTML.escape(logtext) -%]
- [% END %]
-
-
+
+
+
[% IF relatedbuilds %]
-
+
[% END %]
[% IF build.buildsteps %]
@@ -426,37 +426,37 @@
[% INCLUDE renderBuildSteps type="All" %]
[% END %]
-
+
[% IF build.dependents %]
-
Used by
-
-
The following builds have used this build as an input:
-
-
-
- Build Input name System Timestamp
-
- [% FOREACH input IN build.dependents -%]
-
- [% INCLUDE renderFullBuildLink build=input.build %]
- [% input.name %] [% input.build.system %] [% INCLUDE renderDateTime timestamp = input.build.timestamp %]
-
- [% END -%]
-
-
+
Used by
+
+
The following builds have used this build as an input:
+
+
+
+ Build Input name System Timestamp
+
+ [% FOREACH input IN build.dependents -%]
+
+ [% INCLUDE renderFullBuildLink build=input.build %]
+ [% input.name %] [% input.build.system %] [% INCLUDE renderDateTime timestamp = input.build.timestamp %]
+
+ [% END -%]
+
+
Build time history (in seconds)
-
-
+
+
@@ -467,7 +467,7 @@
[% FOREACH prevbuild IN prevBuilds %][% IF prevbuild.build.starttime != 0 %]
d.push([[% prevbuild.starttime * 1000 %],[% prevbuild.get_column('actualBuildTime') %]]);
ids[[% prevbuild.starttime * 1000 %]] = [% prevbuild.id %] ;
- [% END %][% END %]
+ [% END %][% END %]
var options = {
xaxis: { mode: "time" },
@@ -481,10 +481,10 @@
hoverRadius: 4,
},
};
-
+
var plot = $.plot($("#placeholder"), [d], options);
-
+
var overview = $.plot($("#overview"), [d], {
series: {
lines: { show: true, lineWidth: 1 },
@@ -494,20 +494,20 @@
yaxis: { ticks: [], min: 0, autoscaleMargin: 0.1 },
selection: { mode: "x" }
});
-
+
// now connect the two
-
+
$("#placeholder").bind("plotselected", function (event, ranges) {
// do the zooming
plot = $.plot($("#placeholder"), [d],
$.extend(true, {}, options, {
xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to }
}));
-
+
// don't fire event on the overview to prevent eternal loop
overview.setSelection(ranges, true);
});
-
+
$("#overview").bind("plotselected", function (event, ranges) {
plot.setSelection(ranges);
});
@@ -517,15 +517,15 @@
plot.highlight(item.series, item.datapoint);
buildid = ids[item.datapoint[0]];
window.location = "/build/"+buildid;
- }
- });
+ }
+ });
});
Store path size history (in MB)
-
-
+
+
-
+
[% END %]
diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt
index 0f0387e2..12e4b01e 100644
--- a/src/root/channel-contents.tt
+++ b/src/root/channel-contents.tt
@@ -21,7 +21,7 @@ $ nix-env -i foo
You can update to the latest versions of the packages in this channel by executing
-$ nix-channel --update
+$ nix-channel --update
$ nix-env -u '*'
Alternatively, if you have associated the
@@ -35,7 +35,7 @@ install the package simply by clicking on the packages below.
This channel contains the following packages.
-
+
#
@@ -44,7 +44,7 @@ install the package simply by clicking on the packages below.
Description
-
+
[% odd = 0 %]
@@ -69,9 +69,9 @@ install the package simply by clicking on the packages below.
[% END %]
-
+
-
+
diff --git a/src/root/clone-build.tt b/src/root/clone-build.tt
index 44b6ccb7..7dde7a49 100644
--- a/src/root/clone-build.tt
+++ b/src/root/clone-build.tt
@@ -45,7 +45,7 @@
[% END -%]
-
+
diff --git a/src/root/clone-jobset.tt b/src/root/clone-jobset.tt
index 209c52c7..1f7a46e6 100644
--- a/src/root/clone-jobset.tt
+++ b/src/root/clone-jobset.tt
@@ -8,7 +8,7 @@
Cloning jobset [% jobset.project.name %]:[% jobset.name %]
Name
+
Next
diff --git a/src/root/common.tt b/src/root/common.tt
index d0fcfe62..e598985f 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -93,7 +93,7 @@
[%- BLOCK renderBuildListBody -%]
[%- odd = 0 -%]
[%- FOREACH build IN builds -%]
- build [% build.id %][% -%]
[% END %]
@@ -252,7 +252,7 @@
Build failed
(see below )
- [% END %]
+ [% END %]
[% ELSIF build.busy %]
Build in progress
since [% INCLUDE renderDateTime timestamp = build.starttime %]
[% ELSE %]
Scheduled to be built
- [% END %]
+ [% END %]
[% END -%]
[% BLOCK renderInputValue %]
@@ -366,10 +366,10 @@
[% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency, nestedDiff=1, nestLevel=nestLevel+1 %]
[% END %]
- [% ELSE %]
+ [% ELSE %]
[% bi1.name %] Changed input type from '[% type = bi1.type; inputTypes.$type %]' to '[% type = bi2.type; inputTypes.$type %]'
[% END %]
-
+
[% deletedInput = 0 %]
[% END %]
[% END %]
@@ -439,7 +439,7 @@
- [%- FOREACH e IN evals; eval = e.eval;
+ [%- FOREACH e IN evals; eval = e.eval;
link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) -%]
[% eval.id %]
[% e.nrSucceeded %]
[% e.nrFailed %]
- [% IF e.nrScheduled > 0 %]
- [% e.nrScheduled %]
- [% END %]
+ [% IF e.nrScheduled > 0 %]
+ [% e.nrScheduled %]
+ [% END %]
- [%- IF e.diff > 0 -%]
- +[% e.diff %] [% e.diff %] +[% e.diff %] [% e.diff %]
[%- END -%]
diff --git a/src/root/deps.tt b/src/root/deps.tt
index 0e56f04a..8ab580d6 100644
--- a/src/root/deps.tt
+++ b/src/root/deps.tt
@@ -12,7 +12,7 @@
[% FOREACH dep IN runtimedeps -%]
- [% IF dep.buildstep %]
+ [% IF dep.buildstep %]
[% dep.path %]
[% ELSE %]
[% dep.path %]
@@ -30,7 +30,7 @@ Path not available anymore!
[% FOREACH dep IN buildtimedeps -%]
- [% IF dep.buildstep %]
+ [% IF dep.buildstep %]
[% dep.path %]
[% ELSE %]
[% dep.path %]
diff --git a/src/root/edit-release.tt b/src/root/edit-release.tt
index 7f8e86dc..3a9713f4 100644
--- a/src/root/edit-release.tt
+++ b/src/root/edit-release.tt
@@ -7,21 +7,21 @@
[% END %]
diff --git a/src/root/edit-view.tt b/src/root/edit-view.tt
index 57e238e1..7529b106 100644
--- a/src/root/edit-view.tt
+++ b/src/root/edit-view.tt
@@ -24,21 +24,21 @@
-
+
diff --git a/src/root/view-result.tt b/src/root/view-result.tt
index 96fb80ba..12ad2a20 100644
--- a/src/root/view-result.tt
+++ b/src/root/view-result.tt
@@ -37,7 +37,7 @@
[% ELSE %]
Build failed
-
+
[% END %]
[% ELSE %]
diff --git a/src/root/view.tt b/src/root/view.tt
index 05eefd2b..f473a481 100644
--- a/src/root/view.tt
+++ b/src/root/view.tt
@@ -23,7 +23,7 @@
[% END %]
-
+
[% FOREACH result IN results %]
[% link = c.uri_for('/view' project.name view.name result.id) %]
diff --git a/src/script/hydra-control b/src/script/hydra-control
index 1299c4e4..7349e303 100755
--- a/src/script/hydra-control
+++ b/src/script/hydra-control
@@ -28,13 +28,13 @@ elif test "$action" = "status"; then
echo -n "Hydra web server... "
(kill -0 $(cat $HYDRA_DATA/server.pid) 2> /dev/null && echo "ok") || echo "not running"
-
+
echo -n "Hydra evaluator... "
(kill -0 $(cat $HYDRA_DATA/evaluator.pid) 2> /dev/null && echo "ok") || echo "not running"
-
+
echo -n "Hydra queue runner... "
(kill -0 $(cat $HYDRA_DATA/queue_runner.pid) 2> /dev/null && echo "ok") || echo "not running"
-
+
else
echo "Syntax: $0 [start|stop|status]"
diff --git a/src/script/hydra-queue-runner b/src/script/hydra-queue-runner
index 5d774d8e..e1935357 100755
--- a/src/script/hydra-queue-runner
+++ b/src/script/hydra-queue-runner
@@ -80,7 +80,7 @@ sub checkBuilds {
my @systemTypes = $db->resultset('Builds')->search(
{ finished => 0, busy => 0, enabled => 1, disabled => 0 },
{ join => ['project'], select => ['system'], as => ['system'], distinct => 1 });
-
+
# For each system type, select up to the maximum number of
# concurrent build for that system type. Choose the highest
# priority builds first, then the oldest builds.
@@ -165,9 +165,9 @@ while (1) {
eval {
# Clean up zombies.
while ((waitpid(-1, &WNOHANG)) > 0) { };
-
+
unlockDeadBuilds;
-
+
checkBuilds;
};
warn $@ if $@;
diff --git a/src/script/hydra-update-gc-roots b/src/script/hydra-update-gc-roots
index ad49ac1a..8b403be9 100755
--- a/src/script/hydra-update-gc-roots
+++ b/src/script/hydra-update-gc-roots
@@ -90,7 +90,7 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
$project->name, ":", $jobset->name, "\n";
keepBuild $_ foreach $jobset->builds->search(
- { 'me.id' => { 'in' => \
+ { 'me.id' => { 'in' => \
[ "select b2.id from Builds b2 join " .
" (select distinct job, system, coalesce( " .
" (select id from builds where project = b.project and jobset = b.jobset and job = b.job and system = b.system and finished = 1 and buildStatus = 0 order by id desc offset ? limit 1)" .
diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index d978081e..adf3ccbd 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -87,7 +87,7 @@ create table JobsetInputAlts (
-- urgh
value text, -- for most types, a URI; for 'path', an absolute path; for 'string', an arbitrary value
revision text, -- for repositories
-
+
primary key (project, jobset, input, altnr),
foreign key (project, jobset, input) references JobsetInputs(project, jobset, name) on delete cascade on update cascade
);
@@ -121,7 +121,7 @@ create table Builds (
#endif
finished integer not null, -- 0 = scheduled, 1 = finished
-
+
timestamp integer not null, -- time this build was scheduled / finished building
-- Info about the inputs.
@@ -160,7 +160,7 @@ create table Builds (
logfile text, -- if busy, the path of the logfile
disabled integer not null default 0, -- !!! boolean
-
+
startTime integer, -- if busy, time we started
stopTime integer,
@@ -177,7 +177,7 @@ create table Builds (
buildStatus integer,
errorMsg text, -- error message in case of a Nix failure
-
+
logSize bigint,
size bigint,
closureSize bigint,
@@ -230,7 +230,7 @@ create table BuildInputs (
-- Which build this input belongs to.
build integer,
-
+
-- Copied from the jobsetinputs from which the build was created.
name text not null,
type text not null,
@@ -240,9 +240,9 @@ create table BuildInputs (
dependency integer, -- build ID of the input, for type == 'build'
path text,
-
+
sha256hash text,
-
+
foreign key (build) references Builds(id) on delete cascade,
foreign key (dependency) references Builds(id)
);
@@ -339,11 +339,11 @@ create table SystemTypes (
create table Views (
project text not null,
name text not null,
-
+
description text,
-- If true, don't garbage-collect builds included in this view.
- keep integer not null default 0,
+ keep integer not null default 0,
primary key (project, name),
foreign key (project) references Projects(name) on delete cascade on update cascade
@@ -364,9 +364,9 @@ create table ViewJobs (
-- If set, this is the primary job for the view. There can be
-- only one such job per view.
isPrimary integer not null default 0,
-
+
description text,
-
+
jobset text not null,
-- If set, once there is a successful build for every job
@@ -374,7 +374,7 @@ create table ViewJobs (
-- builds is automatically added as a release to the Releases
-- table.
autoRelease integer not null default 0,
-
+
primary key (project, view_, job, attrs),
foreign key (project) references Projects(name) on delete cascade on update cascade,
foreign key (project, view_) references Views(project, name) on delete cascade on update cascade
@@ -419,7 +419,7 @@ create table JobsetEvals (
project text not null,
jobset text not null,
-
+
timestamp integer not null, -- when this entry was added
checkoutTime integer not null, -- how long obtaining the inputs took (in seconds)
evalTime integer not null, -- how long evaluation took (in seconds)
@@ -451,7 +451,7 @@ create table JobsetEvalInputs (
eval integer not null references JobsetEvals(id) on delete cascade,
name text not null,
altNr integer not null,
-
+
-- Copied from the jobsetinputs from which the build was created.
type text not null,
uri text,
@@ -460,7 +460,7 @@ create table JobsetEvalInputs (
dependency integer, -- build ID of the input, for type == 'build'
path text,
-
+
sha256hash text,
primary key (eval, name, altNr),
diff --git a/src/sql/upgrade-2.sql b/src/sql/upgrade-2.sql
index 84299d05..ad4a2fa2 100644
--- a/src/sql/upgrade-2.sql
+++ b/src/sql/upgrade-2.sql
@@ -15,7 +15,7 @@ alter table Builds
add column releaseName text,
add column keep integer not null default 0;
-update Builds b set
+update Builds b set
priority = (select priority from BuildSchedulingInfo s where s.id = b.id),
busy = (select busy from BuildSchedulingInfo s where s.id = b.id),
disabled = (select disabled from BuildSchedulingInfo s where s.id = b.id),
@@ -23,10 +23,10 @@ update Builds b set
logfile = (select logfile from BuildSchedulingInfo s where s.id = b.id)
where exists (select 1 from BuildSchedulingInfo s where s.id = b.id);
-update Builds b set
+update Builds b set
startTime = ((select startTime from BuildSchedulingInfo s where s.id = b.id) union (select startTime from BuildResultInfo r where r.id = b.id));
-update Builds b set
+update Builds b set
isCachedBuild = (select isCachedBuild from BuildResultInfo r where r.id = b.id),
buildStatus = (select buildStatus from BuildResultInfo r where r.id = b.id),
errorMsg = (select errorMsg from BuildResultInfo r where r.id = b.id),
diff --git a/src/sql/upgrade-6.sql b/src/sql/upgrade-6.sql
index b961de1e..f88a07c2 100644
--- a/src/sql/upgrade-6.sql
+++ b/src/sql/upgrade-6.sql
@@ -5,7 +5,7 @@ create table JobsetEvalInputs (
eval integer not null references JobsetEvals(id) on delete cascade,
name text not null,
altNr integer not null,
-
+
-- Copied from the jobsetinputs from which the build was created.
type text not null,
uri text,
@@ -14,7 +14,7 @@ create table JobsetEvalInputs (
dependency integer, -- build ID of the input, for type == 'build'
path text,
-
+
sha256hash text,
primary key (eval, name, altNr),
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae2a1d73..2f896109 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,7 @@ TESTS_ENVIRONMENT = \
NIX_BUILD_HOOK= \
PERL5LIB="$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB" \
PATH=$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/c:$$PATH \
- perl -w
+ perl -w
EXTRA_DIST = \
$(wildcard *.pm) \
@@ -35,7 +35,7 @@ db.sqlite : $(top_srcdir)/src/sql/hydra-sqlite.sql
repos : dirs
-dirs :
+dirs :
mkdir -p data
touch data/hydra.conf
mkdir -p nix
diff --git a/tests/Setup.pm b/tests/Setup.pm
index 69762cc9..1e4bdd17 100644
--- a/tests/Setup.pm
+++ b/tests/Setup.pm
@@ -32,7 +32,7 @@ sub nrQueuedBuildsForJobset {
sub createBaseJobset {
my ($jobsetName, $nixexprpath) = @_;
-
+
my $db = Hydra::Model::DB->new;
my $project = $db->resultset('Projects')->update_or_create({name => "tests", displayname => "", owner => "root"});
my $jobset = $project->jobsets->create({name => $jobsetName, nixexprinput => "jobs", nixexprpath => $nixexprpath, emailoverride => ""});
diff --git a/tests/jobs/basic.nix b/tests/jobs/basic.nix
index 45e6306f..2b76ab5d 100644
--- a/tests/jobs/basic.nix
+++ b/tests/jobs/basic.nix
@@ -1,18 +1,18 @@
with import ./config.nix;
-{
- empty_dir =
+{
+ empty_dir =
mkDerivation {
name = "empty-dir";
builder = ./empty-dir-builder.sh;
};
- fails =
+ fails =
mkDerivation {
name = "fails";
builder = ./fail.sh;
};
- succeed_with_failed =
+ succeed_with_failed =
mkDerivation {
name = "succeed-with-failed";
builder = ./succeed-with-failed.sh;
diff --git a/tests/jobs/build-output-as-input.nix b/tests/jobs/build-output-as-input.nix
index a8c3063e..2d9c63c7 100644
--- a/tests/jobs/build-output-as-input.nix
+++ b/tests/jobs/build-output-as-input.nix
@@ -7,7 +7,7 @@ let
builder = ./empty-dir-builder.sh;
};
- build2 =
+ build2 =
{build1 ? jobs.build1 }:
mkDerivation {
name = "build2";
diff --git a/tests/jobs/bzr-checkout-input.nix b/tests/jobs/bzr-checkout-input.nix
index b4de66c3..bc8d23cb 100644
--- a/tests/jobs/bzr-checkout-input.nix
+++ b/tests/jobs/bzr-checkout-input.nix
@@ -1,7 +1,7 @@
with import ./config.nix;
{ src }:
-{
- copy =
+{
+ copy =
mkDerivation {
name = "bzr-checkout-input";
builder = ./scm-builder.sh;
diff --git a/tests/jobs/bzr-input.nix b/tests/jobs/bzr-input.nix
index 554b94c9..d7747398 100644
--- a/tests/jobs/bzr-input.nix
+++ b/tests/jobs/bzr-input.nix
@@ -1,7 +1,7 @@
with import ./config.nix;
{ src }:
-{
- copy =
+{
+ copy =
mkDerivation {
name = "bzr-input";
builder = ./scm-builder.sh;
diff --git a/tests/jobs/deepgit-input.nix b/tests/jobs/deepgit-input.nix
index 14552fc3..9374b1f6 100644
--- a/tests/jobs/deepgit-input.nix
+++ b/tests/jobs/deepgit-input.nix
@@ -1,7 +1,7 @@
with import ./config.nix;
{ src }:
-{
- copy =
+{
+ copy =
mkDerivation {
name = "git-input";
builder = ./scm-builder.sh;
diff --git a/tests/jobs/git-input.nix b/tests/jobs/git-input.nix
index 14552fc3..9374b1f6 100644
--- a/tests/jobs/git-input.nix
+++ b/tests/jobs/git-input.nix
@@ -1,7 +1,7 @@
with import ./config.nix;
{ src }:
-{
- copy =
+{
+ copy =
mkDerivation {
name = "git-input";
builder = ./scm-builder.sh;
diff --git a/tests/jobs/git-update.sh b/tests/jobs/git-update.sh
index eec0ee9d..afe59717 100755
--- a/tests/jobs/git-update.sh
+++ b/tests/jobs/git-update.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# This script is used both by git & deepgit checks.
-set -e
+set -e
repo=git-repo
export HOME=$(pwd)
@@ -12,9 +12,9 @@ else
state=0;
fi
-echo "STATE: $state"
+echo "STATE: $state"
case $state in
- (0) echo "::Create repo. -- continue -- updated::"
+ (0) echo "::Create repo. -- continue -- updated::"
git init $repo
cd $repo
git config --global user.email "you@example.com"
diff --git a/tests/jobs/hg-input.nix b/tests/jobs/hg-input.nix
index d1d69a1c..dd18b4ab 100644
--- a/tests/jobs/hg-input.nix
+++ b/tests/jobs/hg-input.nix
@@ -1,7 +1,7 @@
with import ./config.nix;
{ src }:
-{
- copy =
+{
+ copy =
mkDerivation {
name = "hg-input";
builder = ./scm-builder.sh;
diff --git a/tests/jobs/svn-checkout-input.nix b/tests/jobs/svn-checkout-input.nix
index b4de66c3..bc8d23cb 100644
--- a/tests/jobs/svn-checkout-input.nix
+++ b/tests/jobs/svn-checkout-input.nix
@@ -1,7 +1,7 @@
with import ./config.nix;
{ src }:
-{
- copy =
+{
+ copy =
mkDerivation {
name = "bzr-checkout-input";
builder = ./scm-builder.sh;
diff --git a/tests/jobs/svn-input.nix b/tests/jobs/svn-input.nix
index a6eba674..cbe0d91d 100644
--- a/tests/jobs/svn-input.nix
+++ b/tests/jobs/svn-input.nix
@@ -1,7 +1,7 @@
with import ./config.nix;
{ src }:
-{
- copy =
+{
+ copy =
mkDerivation {
name = "svn-input";
builder = ./scm-builder.sh;
[%- ELSE -%]
[%- ELSE -%]
@@ -260,7 +260,7 @@
[%- END -%]
[%- END -%]
-[% BLOCK renderStatus %]
+[% BLOCK renderStatus %]
[% IF build.finished %]
[% buildstatus = build.buildstatus %]
[% INCLUDE renderBuildStatusIcon size=16 %]
@@ -279,13 +279,13 @@
[% ELSE %]
Build failed
(see below)
- [% END %]
+ [% END %]
[% ELSIF build.busy %]
Build in progress
since [% INCLUDE renderDateTime timestamp = build.starttime %]
[% ELSE %]
Scheduled to be built
- [% END %]
+ [% END %]
[% END -%]
[% BLOCK renderInputValue %]
@@ -366,10 +366,10 @@
[% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency, nestedDiff=1, nestLevel=nestLevel+1 %]