From aac33b79f868364c34b4afb7024e46255326a19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Mon, 11 Nov 2024 15:27:02 +0100 Subject: [PATCH] #2368: docs: use fixed version of Doxygen --- ci/build_cpp.sh | 1 - ci/deps/doxygen.sh | 18 +++++++++++++ ci/docker/ubuntu-gnu-docs.dockerfile | 38 +++++++++++++++------------- 3 files changed, 39 insertions(+), 18 deletions(-) create mode 100755 ci/deps/doxygen.sh diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 1d7531882f..f1ddf2abdd 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -185,7 +185,6 @@ then git clone https://github.com/mosra/m.css cd m.css git checkout 699abdd5 - sed -i '2600d' documentation/doxygen.py # remove incorrect assertion cd ../ "$MCSS/documentation/doxygen.py" Doxyfile-mcss diff --git a/ci/deps/doxygen.sh b/ci/deps/doxygen.sh new file mode 100755 index 0000000000..eff7a54f36 --- /dev/null +++ b/ci/deps/doxygen.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -exo pipefail + +if test $# -ne 1 +then + echo "usage: ./$0 " + exit 1 +fi + +doxygen_version=$1 +doxygen_tar_name=doxygen-"${doxygen_version}".linux.bin.tar.gz + +echo "${doxygen_tar_name}" + +wget https://sourceforge.net/projects/doxygen/files/rel-"${doxygen_version}"/"${doxygen_tar_name}" + +tar xzf "${doxygen_tar_name}" --one-top-level=doxygen --strip-components=1 diff --git a/ci/docker/ubuntu-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile index 15fcde0a88..07edbaba6a 100644 --- a/ci/docker/ubuntu-gnu-docs.dockerfile +++ b/ci/docker/ubuntu-gnu-docs.dockerfile @@ -13,23 +13,22 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y -q && \ apt-get install -y -q --no-install-recommends \ - ca-certificates \ - curl \ - git \ - mpich \ - libmpich-dev \ - wget \ - ${compiler} \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - doxygen \ - python3 \ - python3-jinja2 \ - python3-pygments \ - texlive-font-utils \ - ghostscript \ - ccache && \ + ${compiler} \ + ca-certificates \ + ccache \ + curl \ + ghostscript \ + git \ + libmpich-dev \ + mpich \ + ninja-build \ + python3 \ + python3-jinja2 \ + python3-pygments \ + texlive-font-utils \ + wget \ + zlib1g \ + zlib1g-dev &&\ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -46,6 +45,11 @@ RUN ./cmake.sh 3.23.4 ${arch} ENV PATH=/cmake/bin/:$PATH +COPY ./ci/deps/doxygen.sh doxygen.sh +RUN ./doxygen.sh 1.8.16 + +ENV PATH=/doxygen/bin/:$PATH + FROM base as build COPY . /vt