Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix release notes XML para closing tag #50852

Merged
merged 1 commit into from Nov 20, 2018
Merged

Fix release notes XML para closing tag #50852

merged 1 commit into from Nov 20, 2018

Conversation

cyounkins
Copy link
Contributor

Motivation for this change

master can't build release notes after this morning's merge:

building '/nix/store/p21i185hrck1q1gn3xlhqy8q9gi4il4q-nixos-manual-combined.drv'...
release-notes/rl-1903.xml:25: parser error : Opening and ending tag mismatch: para line 22 and listitem
   </listitem>
              ^
release-notes/rl-1903.xml:26: parser error : Opening and ending tag mismatch: listitem line 21 and itemizedlist
  </itemizedlist>
                 ^
release-notes/rl-1903.xml:27: parser error : Opening and ending tag mismatch: itemizedlist line 20 and section
 </section>
           ^
release-notes/rl-1903.xml:268: parser error : Premature end of data in tag section line 1

^
release-notes/release-notes.xml:11: element include: XInclude error : could not load release-notes/rl-1903.xml, and no fallback was found

manual-combined.xml:62283: element para: Relax-NG validity error : Did not expect element para there
 62279              </filename></member></simplelist></listitem></varlistentry></variablelist>
 62280   </appendix>
 62281   <appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-release-notes" xml:base="release-notes/release-notes.xml">
 62282   <title>Release Notes</title>
 62283   <para>
 62284    This section lists the release notes for each stable version of NixOS and
 62285    current unstable revision.

manual-combined.xml:62287: element include: Relax-NG validity error : Did not expect element include there
 62283   <para>
 62284    This section lists the release notes for each stable version of NixOS and
 62285    current unstable revision.
 62286   </para>
 62287   <xi:include href="rl-1903.xml"/>
 62288   <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-18.09">
 62289   <title>Release 18.09 (&#x201C;Jellyfish&#x201D;, 2018/10/05)</title>

manual-combined.xml:62287: element include: Relax-NG validity error : Element appendix has extra content: include
 62283   <para>
 62284    This section lists the release notes for each stable version of NixOS and
 62285    current unstable revision.
 62286   </para>
 62287   <xi:include href="rl-1903.xml"/>
 62288   <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-18.09">
 62289   <title>Release 18.09 (&#x201C;Jellyfish&#x201D;, 2018/10/05)</title>

manual-combined.xml:3: element info: Relax-NG validity error : Element book has extra content: info
     1  <?xml version="1.0"?>
     2  <book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="book-nixos-manual">
     3   <info>
     4    <title>NixOS Manual</title>
     5    <subtitle>Version 19.03
     6    </subtitle>
     7   </info>

manual-combined.xml fails to validate
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@cyounkins
Copy link
Contributor Author

@FRidh

samueldr
samueldr approved these changes Nov 20, 2018
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

~/tmp/nixpkgs/nixpkgs-PR50852 $ time nix-build nixos/release.nix -A manual.x86_64-linux
these derivations will be built:
  /nix/store/2rq7w1zwnf8qly4zclnhw5ncxvdsp657-nixos-manual-combined.drv
  /nix/store/i714p2dz2fv3anwap8lvzl88hzbr743z-manual-olinkdb.drv
  /nix/store/bp4wm1ny2c4fy1g7ch4f7x8zbq5w5y9p-nixos-manual-html.drv
building '/nix/store/2rq7w1zwnf8qly4zclnhw5ncxvdsp657-nixos-manual-combined.drv'...

manual-combined.xml validates

man-pages-combined.xml validates
building '/nix/store/i714p2dz2fv3anwap8lvzl88hzbr743z-manual-olinkdb.drv'...
Writing /nix/store/3s877a69vyyyycmbla2i9r0qw57rblak-manual-olinkdb/manual.db for book(book-nixos-manual)
building '/nix/store/bp4wm1ny2c4fy1g7ch4f7x8zbq5w5y9p-nixos-manual-html.drv'...
Writing options.html for appendix(ch-options)
Writing release-notes.html for appendix(ch-release-notes)
Writing index.html for book(book-nixos-manual)
/nix/store/0v21hn83zl190wvv6x3nbhx4c1qwjrkz-nixos-manual-html

 → exit status: 0
 → user: 1.78, system: 0.16, elapsed: 0:24.00
 → cpu: 8%, max mem: 513724, avg mem: 0, unshared: 0
 → I/O: <I:0 O:0>, sock: <r:0 s:0>

@samueldr samueldr merged commit 80f5d78 into NixOS:master Nov 20, 2018
@c0bw3b c0bw3b mentioned this pull request Nov 20, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr samueldr approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cyounkins @samueldr @GrahamcOfBorg