diff options
| author | Emilio Jesus Gallego Arias | 2020-06-05 17:32:10 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2020-06-05 17:32:10 +0200 |
| commit | c937f72bb804a74f89fb0ccf7aa7298f8d33eaf4 (patch) | |
| tree | a8d769b3624a4860c75ad7d85a9313d1d07720f5 | |
| parent | de430532053269a53661b923161d693ab11950b6 (diff) | |
| parent | 19d5ebc6477686d2c57d44a08c5d200cc74db931 (diff) | |
Merge PR #12397: Fix #12280: do not use xindy to avoid build failures on some machines.
Reviewed-by: SkySkimmer
Reviewed-by: cpitclaudel
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 5 | ||||
| -rw-r--r-- | doc/README.md | 3 | ||||
| -rwxr-xr-x | doc/sphinx/conf.py | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8244fafc8..5e36034554 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: variables: # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here # for reference] - CACHEKEY: "bionic_coq-V2020-05-19-V33" + CACHEKEY: "bionic_coq-V2020-05-24-V1" IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY" # By default, jobs run in the base switch; override to select another switch OPAM_SWITCH: "base" diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 0d2f1dfbc7..8c5696f4f9 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2020-05-19-V33" +# CACHEKEY: "bionic_coq-V2020-05-24-V1" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -13,8 +13,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -y -qq \ libgtksourceview-3.0-dev \ # Dependencies of stdlib and sphinx doc texlive-latex-extra texlive-fonts-recommended texlive-xetex latexmk \ - xindy python3-pip python3-setuptools python3-pexpect python3-bs4 \ - fonts-freefont-otf \ + python3-pip python3-setuptools python3-pexpect python3-bs4 fonts-freefont-otf \ # Dependencies of source-doc and coq-makefile texlive-science tipa diff --git a/doc/README.md b/doc/README.md index 8e1bc85c49..e3ab5ae4d2 100644 --- a/doc/README.md +++ b/doc/README.md @@ -58,7 +58,6 @@ additional tools are required: - makeindex - xelatex - latexmk - - xindy All of them are part of the TexLive distribution. E.g. on Debian / Ubuntu, install them with: @@ -68,7 +67,7 @@ install them with: Or if you want to use less disk space: apt install texlive-latex-extra texlive-fonts-recommended texlive-xetex \ - latexmk xindy fonts-freefont-otf + latexmk fonts-freefont-otf Compilation ----------- diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 8be0b5a332..99762c7a0e 100755 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -357,6 +357,9 @@ latex_elements = { latex_engine = "xelatex" +# Cf. https://github.com/sphinx-doc/sphinx/issues/7015 +latex_use_xindy = False + ######## # done # ######## |