From: Tuomas Ahola Date: Fri, 11 Sep 2026 19:52:50 GMT Subject: [PATCH (RESEND)] ci: use system asciidoctor Message-ID: <20260911195250.31201-1-taahol@utu.fi> In-Reply-To: <20260902071113.GA70165@coredump.intra.peff.net> From: Jeff King 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 Signed-off-by: Tuomas Ahola --- 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