diff options
| author | Chayoung You <yousbe@gmail.com> | 2020-04-06 22:05:17 +0900 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2020-05-08 23:24:40 -0400 |
| commit | 16a1221fc70d586a07bd0421722635c61df525be (patch) | |
| tree | 611f5a62193657edf7eef8b895e99e863e7f3a22 /ci | |
| parent | 793c1179ccd7e755d635beee8be5c1e2202d404b (diff) | |
doc: use asciidoctor instead of a2x
AsciiDoc development is continued under asciidoctor. See
https://github.com/asciidoc/asciidoc.
We do however fallback to a2x if asciidoctor is not present. This is to
ease migration, but at some point, it's likely that support for a2x will
be dropped.
Originally reported downstream:
https://github.com/Homebrew/linuxbrew-core/issues/19885
Closes #1544
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/docker/README.md | 2 | ||||
| -rwxr-xr-x | ci/macos-install-packages | 2 | ||||
| -rwxr-xr-x | ci/ubuntu-install-packages | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/docker/README.md b/ci/docker/README.md index 58f367ef..89baa249 100644 --- a/ci/docker/README.md +++ b/ci/docker/README.md @@ -4,7 +4,7 @@ via the [Cross](https://github.com/rust-embedded/cross) tool. The Cross tool actually provides its own Docker images, and all Docker images in this directory are derived from one of them. We provide our own in order to customize the environment. For example, we need to install some things like -`asciidoc` in order to generate man pages. We also install compression tools +`asciidoctor` in order to generate man pages. We also install compression tools like `xz` so that tests for the `-z/--search-zip` flag are run. If you make a change to a Docker image, then you can re-build it. `cd` into the diff --git a/ci/macos-install-packages b/ci/macos-install-packages index 309562f7..dc0955c5 100755 --- a/ci/macos-install-packages +++ b/ci/macos-install-packages @@ -1,3 +1,3 @@ #!/bin/sh -brew install asciidoc docbook-xsl +brew install asciidoctor diff --git a/ci/ubuntu-install-packages b/ci/ubuntu-install-packages index edaac6f4..b372e0e4 100755 --- a/ci/ubuntu-install-packages +++ b/ci/ubuntu-install-packages @@ -2,5 +2,5 @@ sudo apt-get update sudo apt-get install -y --no-install-recommends \ - libxslt1-dev asciidoc docbook-xsl xsltproc libxml2-utils \ + asciidoctor \ zsh xz-utils liblz4-tool musl-tools |