Skip to content

Commit

Permalink
#2368: docs: use fixed version of Doxygen
Browse files Browse the repository at this point in the history
  • Loading branch information
cz4rs committed Nov 11, 2024
1 parent 706dc4b commit aac33b7
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 18 deletions.
1 change: 0 additions & 1 deletion ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions ci/deps/doxygen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env bash

set -exo pipefail

if test $# -ne 1
then
echo "usage: ./$0 <doxygen-version>"
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
38 changes: 21 additions & 17 deletions ci/docker/ubuntu-gnu-docs.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand All @@ -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

Expand Down

0 comments on commit aac33b7

Please sign in to comment.