summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-06 03:25:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-06 03:25:16 (GMT)
commitfaf5576a8d749c7c46fafd0c62da47ec078e1486 (patch)
tree75bd7cb59dd5b83229c2bd2ca5586534086bb0e2 /ci
parent314fcd32d79c2c9ccf471f5a84f1407393d1a1fc (diff)
parentf6461b82b932013f170acf357c4dd3468c923f73 (diff)
downloadgit-faf5576a8d749c7c46fafd0c62da47ec078e1486.zip
git-faf5576a8d749c7c46fafd0c62da47ec078e1486.tar.gz
git-faf5576a8d749c7c46fafd0c62da47ec078e1486.tar.bz2
Merge branch 'bc/doc-use-docbook-5'
Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0 no longer works with the older one. * bc/doc-use-docbook-5: Documentation: fix build with Asciidoctor 2
Diffstat (limited to 'ci')
-rwxr-xr-xci/install-dependencies.sh2
-rwxr-xr-xci/test-documentation.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 8cc7250..a76f348 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -53,7 +53,7 @@ StaticAnalysis)
;;
Documentation)
sudo apt-get -q update
- sudo apt-get -q -y install asciidoc xmlto
+ sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
gem install --version 1.5.8 asciidoctor
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index d490898..b3e76ef 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -8,6 +8,8 @@
filter_log () {
sed -e '/^GIT_VERSION = /d' \
-e '/^ \* new asciidoc flags$/d' \
+ -e '/stripped namespace before processing/d' \
+ -e '/Attributed.*IDs for element/d' \
"$1"
}