diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm index fbf64d45..f800c41a 100644 --- a/src/lib/Hydra/Schema/Builds.pm +++ b/src/lib/Hydra/Schema/Builds.pm @@ -170,11 +170,6 @@ __PACKAGE__->table("Builds"); data_type: 'integer' is_nullable: 1 -=head2 errormsg - - data_type: 'text' - is_nullable: 1 - =head2 size data_type: 'bigint' @@ -249,8 +244,6 @@ __PACKAGE__->add_columns( { data_type => "integer", is_nullable => 1 }, "buildstatus", { data_type => "integer", is_nullable => 1 }, - "errormsg", - { data_type => "text", is_nullable => 1 }, "size", { data_type => "bigint", is_nullable => 1 }, "closuresize", @@ -544,8 +537,8 @@ __PACKAGE__->many_to_many( ); -# Created by DBIx::Class::Schema::Loader v0.07043 @ 2015-10-27 13:54:16 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iN9vwO5i3dURKOTgaPTHxw +# Created by DBIx::Class::Schema::Loader v0.07043 @ 2016-02-12 17:20:42 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/8aVtXu/+o0jmKHnSzwt+g __PACKAGE__->has_many( "dependents", diff --git a/src/root/build.tt b/src/root/build.tt index 3cafc571..1ed16fd8 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -280,11 +280,6 @@ FOR step IN steps; IF step.busy; busy = 1; END; END; [% END %] - [% IF build.errormsg && build.buildstatus != 5 %] -

Nix error output

-
[% HTML.escape(build.errormsg) %]
- [% END %] - [% END %] diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql index 2e7bf0ce..b627684d 100644 --- a/src/sql/hydra.sql +++ b/src/sql/hydra.sql @@ -184,7 +184,7 @@ create table Builds ( -- 0 = succeeded -- 1 = build of this derivation failed -- 2 = build of some dependency failed - -- 3 = other failure (see errorMsg) + -- 3 = other failure -- 4 = build cancelled (removed from queue; never built) -- 5 = build not done because a dependency failed previously (obsolete) -- 6 = failure with output @@ -193,8 +193,6 @@ create table Builds ( -- 10 = log limit exceeded buildStatus integer, - errorMsg text, -- error message in case of a Nix failure - size bigint, closureSize bigint, diff --git a/src/sql/upgrade-44.sql b/src/sql/upgrade-44.sql new file mode 100644 index 00000000..3f43f1bc --- /dev/null +++ b/src/sql/upgrade-44.sql @@ -0,0 +1 @@ +alter table Builds drop column errorMsg;