[PATCH 2/2] ci: use system asciidoctor
- From
Jeff King <peff@peff.net>
- Date
- Sep 2, 2026, 07:16 UTC
- Message-ID
- <20260902071613.GB641414@coredump.intra.peff.net>
- In-Reply-To
- <20260902071113.GA70165@coredump.intra.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> --- Confirmed that this successfully ran CI via GitHub Actions. Looks like the image there uses asciidoctor 2.0.20, which seems reasonable (it's from 2023, but stable images tend to lag about that much).
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
-- 2.55.0.1074.gcd259ea853