From: Tuomas Ahola <taahol@utu.fi>
To: <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jean-Noël Avila" <jn.avila@free.fr>, "Jeff King" <peff@peff.net>,
"Tuomas Ahola" <taahol@utu.fi>
Subject: [PATCH (RESEND)] ci: use system asciidoctor
Date: Fri, 11 Sep 2026 22:52:50 +0300 [thread overview]
Message-ID: <20260911195250.31201-1-taahol@utu.fi> (raw)
In-Reply-To: <20260902071113.GA70165@coredump.intra.peff.net>
From: Jeff King <peff@peff.net>
Our CI Documentation builds have pinned asciidoctor since 615a6c37e1
(ci: stick with Asciidoctor v1.5.8 for now, 2019-03-29). Back then a few
changes were needed to build with the then-new v2.0.0.
We've since made those changes, in f6461b82b9 (Documentation: fix build
with Asciidoctor 2, 2019-09-15) and other commits. So it is not only
safe to use newer versions of asciidoctor, but preferable: it's what
people are likely to use for actually building the documentation in
practice!
I don't think there's any need to pin to a specific version. We can just
use what ships in our Ubuntu image, which should give us an arbitrary
representative version (and if it changes and something breaks, we'd
want to know).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Tuomas Ahola <taahol@utu.fi>
---
Notes:
The release notes draft for v2.56.0 already claims that asciidoctor
has been updated to be installed via the system package manager.
Clearly it refers to this patch which isn't, however, anywhere near
the master branch.
ci/install-dependencies.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 2f61fbb07c..d57dce5663 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -164,9 +164,9 @@ sparse)
libexpat-dev gettext zlib1g-dev sparse
;;
Documentation)
- sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make ruby
+ sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make ruby \
+ asciidoctor
- sudo gem install --version 1.5.8 asciidoctor
sudo gem install concurrent-ruby
;;
esac
--
jk/ci-use-system-asciidoctor-for-real
next prev parent reply other threads:[~2026-09-11 19:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-01 8:16 [PATCH] ci: fix missing Ruby dependency in "documentation" job Patrick Steinhardt
2026-09-01 8:24 ` Toon Claes
2026-09-01 8:36 ` Patrick Steinhardt
2026-09-01 8:47 ` Jeff King
2026-09-01 8:51 ` Jeff King
2026-09-01 10:41 ` Patrick Steinhardt
2026-09-02 7:11 ` [PATCH 0/2] bump ci asciidoctor version Jeff King
2026-09-02 7:14 ` [PATCH 1/2] ci: drop ALREADY_HAVE_ASCIIDOCTOR variable Jeff King
2026-09-02 7:16 ` [PATCH 2/2] ci: use system asciidoctor Jeff King
2026-09-02 7:55 ` Patrick Steinhardt
2026-09-02 9:01 ` Jeff King
2026-09-02 9:59 ` Patrick Steinhardt
2026-09-05 14:02 ` Jeff King
2026-09-05 15:23 ` Todd Zullinger
2026-09-11 20:42 ` Jeff King
2026-09-11 19:52 ` Tuomas Ahola [this message]
2026-09-11 20:38 ` [PATCH (RESEND)] " Jeff King
2026-09-11 20:58 ` Junio C Hamano
2026-09-11 21:33 ` Tuomas Ahola
2026-09-11 21:50 ` Junio C Hamano
2026-09-01 17:58 ` [PATCH] ci: fix missing Ruby dependency in "documentation" job Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260911195250.31201-1-taahol@utu.fi \
--to=taahol@utu.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jn.avila@free.fr \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox