Skip to content

Commit 2461d32

Browse files
authored
Drop support for asciidoctor outside of docker (#611)
We initially supported asciidoctor in the same way that the docs build supported everything else: by copying the source into the repo. Now that we have docker to resolve our dependencies we don't need to do that. This blasts asciidoctor from the repo and the infrastructure for copying it locally.
1 parent 9b91999 commit 2461d32

File tree

191 files changed

+8
-58127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+8
-58127
lines changed

build_docs.pl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ sub build_local {
104104

105105
_guess_opts_from_file($index);
106106

107+
if ( $Opts->{asciidoctor} && !$running_in_standard_docker ) {
108+
die "--asciidoctor is only supported by build_docs and not by build_docs.pl";
109+
}
110+
107111
if ( $Opts->{single} ) {
108112
$dir->rmtree;
109113
$dir->mkpath;
@@ -605,7 +609,6 @@ sub init_env {
605609

606610
$ENV{PATH}
607611
= dir('resources/asciidoc-8.6.8/')->absolute
608-
. ':' . dir('resources/asciidoctor/bin')->absolute
609612
. ":$FindBin::RealBin:"
610613
. $ENV{PATH};
611614

resources/asciidoctor/.bundle/config

Lines changed: 0 additions & 4 deletions
This file was deleted.

resources/asciidoctor/.bundle/prod/config

Lines changed: 0 additions & 4 deletions
This file was deleted.

resources/asciidoctor/Gemfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

resources/asciidoctor/Gemfile.lock

Lines changed: 0 additions & 28 deletions
This file was deleted.

resources/asciidoctor/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ MAKEFLAGS += --silent
77
.PHONY: check
88
check:
99
rspec
10-
rubocop --cache false lib spec
10+
rubocop --cache false

resources/asciidoctor/README

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
The `bin` and `vendor` directories contain a fully checked out copy of
2-
asciidoctor. You should be able to update it by changing the `Gemfile` and
3-
running:
4-
5-
```
6-
cd resources/asciidoctor
7-
BUNDLE_APP_CONFIG=.bundle/prod bundle install --standalone --no-cache
8-
```
9-
10-
The `lib` directory contains extensions to asciidoctor that are required for
11-
Elastic's docs. You can test them with:
12-
13-
```
14-
cd resources/asciidoctor
15-
bundle install
16-
./build/bin/rspec
17-
```
1+
These are Elastic's extensions to Asciidoctor! The `lib` directory contains
2+
the actual extensions and the spec directory contains the tests. You can run
3+
the tests with `build_docs --self-test`.

resources/asciidoctor/bin/asciidoctor

Lines changed: 0 additions & 14 deletions
This file was deleted.

resources/asciidoctor/bin/asciidoctor-safe

Lines changed: 0 additions & 14 deletions
This file was deleted.

resources/asciidoctor/bin/bundle

Lines changed: 0 additions & 105 deletions
This file was deleted.

resources/asciidoctor/bin/bundler

Lines changed: 0 additions & 14 deletions
This file was deleted.

resources/asciidoctor/vendor/bundle/bundler/setup.rb

Lines changed: 0 additions & 7 deletions
This file was deleted.

resources/asciidoctor/vendor/bundle/ruby/2.5.0/bin/asciidoctor

Lines changed: 0 additions & 27 deletions
This file was deleted.

resources/asciidoctor/vendor/bundle/ruby/2.5.0/bin/asciidoctor-safe

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)