Skip to content

Conversation

@Venefilyn
Copy link
Member

@Venefilyn Venefilyn commented Oct 28, 2025

Adds asciidoctor for Ubuntu 22/24 and Debian Trixie as required by the
asciidoc PR.

  • image-refresh debian-trixie

Related-to: cockpit-project/cockpit#21515
Related-to: https://issues.redhat.com/browse/COCKPIT-1339
Signed-off-by: Freya Gustavsson [email protected]

@cockpituous cockpituous changed the title doc: AsciiDoctor for Debian Trixie WIP: c8ede9b55535: [no-test] doc: AsciiDoctor for Debian Trixie Oct 28, 2025
@Venefilyn Venefilyn marked this pull request as draft October 28, 2025 14:51
@cockpituous
Copy link
Contributor

@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: c8ede9b55535: [no-test] doc: AsciiDoctor for Debian Trixie doc: AsciiDoctor for Debian Trixie Oct 28, 2025
@Venefilyn Venefilyn marked this pull request as ready for review October 28, 2025 15:53
@Venefilyn Venefilyn requested a review from jelly October 28, 2025 15:54
@jelly
Copy link
Member

jelly commented Oct 28, 2025

This script is shared with Ubuntu, maybe I should have said so. Do all Ubuntu's have asciidoctor? Secondly this should go into the build chroot, see bedcfc8

@jelly
Copy link
Member

jelly commented Oct 28, 2025

Sorry I triggered the tests before submitting my comment.

@Venefilyn Venefilyn force-pushed the doc/debian-trixie-asciidoctor branch from 8297003 to c1ca030 Compare October 28, 2025 16:49
@Venefilyn Venefilyn changed the title doc: AsciiDoctor for Debian Trixie doc: AsciiDoctor for Ubuntu/Debian Oct 28, 2025
@Venefilyn Venefilyn force-pushed the doc/debian-trixie-asciidoctor branch from c1ca030 to 6314d44 Compare October 28, 2025 16:51
@Venefilyn
Copy link
Member Author

Venefilyn commented Oct 28, 2025

This script is shared with Ubuntu, maybe I should have said so. Do all Ubuntu's have asciidoctor?

Yeah from what I can see all of them should have asciidoctor

Exact hits
Package asciidoctor

    jammy (22.04LTS) (ruby): AsciiDoc to HTML rendering for Ruby [universe]
    2.0.16-2: all
    noble (24.04LTS) (ruby): AsciiDoc to HTML rendering for Ruby [universe]
    2.0.20-1: all
    oracular (24.10) (ruby): AsciiDoc to HTML rendering for Ruby [universe]
    2.0.20-1: all
    plucky (25.04) (ruby): AsciiDoc to HTML rendering for Ruby [universe]
    2.0.23-1: all
    questing (ruby): AsciiDoc to HTML rendering for Ruby [universe]
    2.0.23-1: all

Secondly this should go into the build chroot, see bedcfc8

Ack, moved it there now

Comment on lines 277 to 278
# TEMP: until asciidoc migration is into cockpit.git.
asciidoctor
Copy link
Member

Choose a reason for hiding this comment

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

How does that even work? I suppose that was meant as an additional argument to apt-get, but it's on its own line now, aso called as a command. Supposedly that only works because that script isn't set -e?

Copy link
Member Author

@Venefilyn Venefilyn Oct 28, 2025

Choose a reason for hiding this comment

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

Oh shoot.. I'm tired. Yeah I meant to use apt-get

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

@jelly
Copy link
Member

jelly commented Oct 31, 2025

I don't think this was properly refreshed? Asciidoctor would not be in the buildchroot, just checked:

root@debian-trixie-127-0-0-2-2201:~# tar tvf /var/cache/pbuilder/base.tgz  | grep asciidoctor
root@debian-trixie-127-0-0-2-2201:~#

Please re-refresh.

@cockpituous cockpituous changed the title doc: AsciiDoctor for Ubuntu/Debian WIP: b622810af750: [no-test] doc: AsciiDoctor for Ubuntu/Debian Oct 31, 2025
@cockpituous cockpituous changed the title WIP: b622810af750: [no-test] doc: AsciiDoctor for Ubuntu/Debian doc: AsciiDoctor for Ubuntu/Debian Oct 31, 2025
@cockpituous
Copy link
Contributor

Failed. Log: https://logs-cockpit.apps.ocp.cloud.ci.centos.org/image-refresh-debian-trixie-710836d8-20251031-132322/log.html

@Venefilyn Venefilyn force-pushed the doc/debian-trixie-asciidoctor branch from 710836d to 53c7e1a Compare October 31, 2025 13:33
Adds `asciidoctor` for Ubuntu 22/24 and Debian Trixie as required by the
asciidoc PR.

Related-to: cockpit-project/cockpit#21515
Signed-off-by: Freya Gustavsson <[email protected]>
@Venefilyn Venefilyn force-pushed the doc/debian-trixie-asciidoctor branch from 53c7e1a to 6d6c621 Compare October 31, 2025 13:35
@cockpituous cockpituous changed the title doc: AsciiDoctor for Ubuntu/Debian WIP: fa2642b2ee60: [no-test] doc: AsciiDoctor for Ubuntu/Debian Oct 31, 2025
@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: fa2642b2ee60: [no-test] doc: AsciiDoctor for Ubuntu/Debian doc: AsciiDoctor for Ubuntu/Debian Oct 31, 2025
@cockpituous
Copy link
Contributor

@Venefilyn
Copy link
Member Author

I don't think this was properly refreshed? Asciidoctor would not be in the buildchroot, just checked:

root@debian-trixie-127-0-0-2-2201:~# tar tvf /var/cache/pbuilder/base.tgz  | grep asciidoctor
root@debian-trixie-127-0-0-2-2201:~#

Please re-refresh.

Weird, likely fixed then undid it somehow. @jelly PTAL now 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants