From be0ec2d22332d382781d7f45f474b57ad0f5c411 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Mar 2020 16:17:48 +0100 Subject: [PATCH 1/4] Remove style.css https://github.com/NixOS/nix/issues/3392 --- doc/manual/Makefile.am | 3 +- doc/manual/style.css | 256 ----------------------------------------- 2 files changed, 1 insertion(+), 258 deletions(-) delete mode 100644 doc/manual/style.css diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 353f5ee1..10c8f6ee 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -3,14 +3,13 @@ DOCBOOK_FILES = installation.xml introduction.xml manual.xml projects.xml hackin EXTRA_DIST = $(DOCBOOK_FILES) xsltproc_opts = \ - --param html.stylesheet \'style.css\' \ --param callout.graphics.extension \'.gif\' \ --param section.autolabel 1 \ --param section.label.includes.component.label 1 # Include the manual in the tarball. -dist_html_DATA = manual.html style.css +dist_html_DATA = manual.html # Embed Docbook's callout images in the distribution. EXTRA_DIST += images diff --git a/doc/manual/style.css b/doc/manual/style.css deleted file mode 100644 index 3a0c8fa1..00000000 --- a/doc/manual/style.css +++ /dev/null @@ -1,256 +0,0 @@ -/* Copied from http://bakefile.sourceforge.net/, which appears - licensed under the GNU GPL. */ - - -/*************************************************************************** - Basic headers and text: - ***************************************************************************/ - -body -{ - font-family: "Nimbus Sans L", sans-serif; - background: white; - margin: 2em 1em 2em 1em; -} - -h1, h2, h3, h4 -{ - color: #005aa0; -} - -h1 /* title */ -{ - font-size: 200%; -} - -h2 /* chapters, appendices, subtitle */ -{ - font-size: 180%; -} - -/* Extra space between chapters, appendices. */ -div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 -{ - margin-top: 1.5em; -} - -div.section > div.titlepage h2 /* sections */ -{ - font-size: 150%; - margin-top: 1.5em; -} - -h3 /* subsections */ -{ - font-size: 125%; -} - -div.simplesect h2 -{ - font-size: 110%; -} - -div.appendix h3 -{ - font-size: 150%; - margin-top: 1.5em; -} - -div.refnamediv h2, div.refsynopsisdiv h2, div.refsection h2 /* refentry parts */ -{ - margin-top: 1.4em; - font-size: 125%; -} - -div.refsection h3 -{ - font-size: 110%; -} - - -/*************************************************************************** - Examples: - ***************************************************************************/ - -div.example -{ - border: 1px solid #b0b0b0; - padding: 6px 6px; - margin-left: 1.5em; - margin-right: 1.5em; - background: #f4f4f8; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.example p.title -{ - margin-top: 0em; -} - -div.example pre -{ - box-shadow: none; -} - - -/*************************************************************************** - Screen dumps: - ***************************************************************************/ - -pre.screen, pre.programlisting -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; - color: #600000; - background: #f4f4f8; - font-family: monospace; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.example pre.programlisting -{ - border: 0px; - padding: 0 0; - margin: 0 0 0 0; -} - - -/*************************************************************************** - Notes, warnings etc: - ***************************************************************************/ - -.note, .warning -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; - margin-bottom: 1em; - padding: 0.3em 0.3em 0.3em 0.3em; - background: #fffff5; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.note, div.warning -{ - font-style: italic; -} - -div.note h3, div.warning h3 -{ - color: red; - font-size: 100%; - padding-right: 0.5em; - display: inline; -} - -div.note p, div.warning p -{ - margin-bottom: 0em; -} - -div.note h3 + p, div.warning h3 + p -{ - display: inline; -} - -div.note h3 -{ - color: blue; - font-size: 100%; -} - -div.navfooter * -{ - font-size: 90%; -} - - -/*************************************************************************** - Links colors and highlighting: - ***************************************************************************/ - -a { text-decoration: none; } -a:hover { text-decoration: underline; } -a:link { color: #0048b3; } -a:visited { color: #002a6a; } - - -/*************************************************************************** - Table of contents: - ***************************************************************************/ - -div.toc -{ - font-size: 90%; -} - -div.toc dl -{ - margin-top: 0em; - margin-bottom: 0em; -} - - -/*************************************************************************** - Special elements: - ***************************************************************************/ - -tt, code -{ - color: #400000; -} - -.term -{ - font-weight: bold; - -} - -div.variablelist dd p, div.glosslist dd p -{ - margin-top: 0em; -} - -div.variablelist dd, div.glosslist dd -{ - margin-left: 1.5em; -} - -div.glosslist dt -{ - font-style: italic; -} - -.varname -{ - color: #400000; -} - -span.command strong -{ - font-weight: normal; - color: #400000; -} - -div.calloutlist table -{ - box-shadow: none; -} - -table -{ - border-collapse: collapse; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.affiliation -{ - font-style: italic; -} - From 5ae8b54d258c15277d9a53c54934e4ddb4fd22be Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Mar 2020 19:56:55 +0100 Subject: [PATCH 2/4] README.md: Link to the latest manual (cherry picked from commit 455611b0b4e97290a858687142805babc9929673) --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 92d9e2fe..568ef4c3 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Hydra -[Hydra](https://nixos.org/hydra/) is a continuous integration system based -on the Nix package manager. For more information, see the -[manual](http://nixos.org/hydra/manual/). +Hydra is a continuous integration system based on the Nix package +manager. For more information, see the +[manual](https://hydra.nixos.org/job/hydra/master/manual/latest/download-by-type/doc/manual). For development see -[hacking instructions](http://nixos.org/hydra/manual/#chap-hacking). +[hacking instructions](https://hydra.nixos.org/job/hydra/master/manual/latest/download-by-type/doc/manual#chap-hacking). --- From 73694087a088ed4481b4ab268a03351b1bcaac3c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 21 Mar 2020 21:08:33 +0100 Subject: [PATCH 3/4] Use the stopsign as icon for timeouts and exceeded log-limits When I browse failed builds in a jobset-eval on Hydra, I regularly mistake actual build-failures with temporary issues like timeouts (that probably disappear at the next eval). To prevent this kind of issue, I figured that using the stopsign-svg for builds with timeouts or exceeded log-limits is a reasonable choice for the following reasons: * A user can now distinguish between actual build-errors (like compilation-failures or oversized outputs) and (usually) temporary issues (like a bloated log or a timeout). * The stopsign is also used for aborted jobs that are shown in a different tab and can't be confused with timeouts for that reason. --- src/root/common.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/root/common.tt b/src/root/common.tt index ed59da67..83b1c736 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -229,9 +229,9 @@ BLOCK renderBuildStatusIcon; [% ELSIF buildstatus == 6 %] Failed with output [% ELSIF buildstatus == 7 %] - Timed out + Timed out [% ELSIF buildstatus == 10 %] - Log limit exceeded + Log limit exceeded [% ELSIF buildstatus == 11 %] Output size limit exceeded [% ELSIF buildstatus == 12 %] From 12cc46cdb36321acd4c982429a86eb0f8f3cc969 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 24 Mar 2020 11:22:14 -0400 Subject: [PATCH 4/4] fixup: hydra-init: correct reference to hydra-backill-ids --- src/script/hydra-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/hydra-init b/src/script/hydra-init index 1a5f2439..0b564ce6 100755 --- a/src/script/hydra-init +++ b/src/script/hydra-init @@ -51,7 +51,7 @@ WARNING: Schema version 62 and 63 make nullable jobset_id fields on migration will take many hours. Because of that, the migration is not automatic, and must be performed manually. - To backfill these IDs, run: hydra-fill-ids + To backfill these IDs, run: hydra-backfill-ids QUOTE }