diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2019-03-29 13:35:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-01 15:17:47 +0900 |
| commit | f34a1bd96c42ac712a8eb828f2303af029c6cd86 (patch) | |
| tree | 5a47d195b9653f65365a55699160ddbb95c17320 /ci | |
| parent | b373e4d29b7eb67a40efc038156a8edde7ae2972 (diff) | |
| download | git-f34a1bd96c42ac712a8eb828f2303af029c6cd86.tar.gz | |
ci: install Asciidoctor in 'ci/install-dependencies.sh'
When our '.travis.yml' was split into several 'ci/*' scripts [1], the
installation of the 'asciidoctor' gem somehow ended up in
'ci/test-documentation.sh'.
Install it in 'ci/install-dependencies.sh', where we install other
dependencies of the Documentation build job as well (asciidoc,
xmlto).
[1] 657343a602 (travis-ci: move Travis CI code into dedicated scripts,
2017-09-10)
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install-dependencies.sh | 3 | ||||
| -rwxr-xr-x | ci/test-documentation.sh | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d64667fcbf..76ec308965 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -54,6 +54,9 @@ StaticAnalysis) Documentation) sudo apt-get -q update sudo apt-get -q -y install asciidoc xmlto + + test -n "$ALREADY_HAVE_ASCIIDOCTOR" || + gem install asciidoctor ;; esac diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh index be3b7d376a..8f91f48c81 100755 --- a/ci/test-documentation.sh +++ b/ci/test-documentation.sh @@ -5,9 +5,6 @@ . ${0%/*}/lib.sh -test -n "$ALREADY_HAVE_ASCIIDOCTOR" || -gem install asciidoctor - make check-builtins make check-docs |