Skip to content

Commit 760d859

Browse files
authored
Upgrade to Doxygen 1.12.0 (#146)
1 parent 5dd459b commit 760d859

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

.github/workflows/docs.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,22 @@ jobs:
2424
runs-on: ubuntu-latest
2525
container: libfn/ci-docs:latest
2626
steps:
27-
- uses: actions/checkout@v3
28-
with:
29-
submodules: 'true'
27+
- uses: actions/checkout@v4
3028

31-
- name: Export docs
29+
# Guardrail to ensure that we do not update docs after a bad merge
30+
- name: Build and run tests
3231
continue-on-error: false
3332
run: |
3433
mkdir .build
3534
cd .build
36-
cmake -DDOCS=True ..
35+
cmake -DDOCS=On ..
36+
cmake --build .
37+
ctest
38+
39+
- name: Export docs
40+
continue-on-error: false
41+
run: |
42+
cd .build
3743
cmake --build . --target export_docs
3844
3945
- name: Setup Pages

ci/docs/Dockerfile

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,22 @@ RUN set -ex ;\
3636
apt-get update ;\
3737
apt-get install -y --no-install-recommends \
3838
ca-certificates gpg gpg-agent wget vim \
39-
cmake ninja-build binutils libc6-dev git \
40-
openjdk-17-jdk doxygen unzip ;\
39+
cmake ninja-build make binutils libc6-dev git \
40+
openjdk-17-jdk unzip ;\
4141
apt-get clean
4242

43+
ARG DOXYGEN_RELEASE=1.12.0
44+
ENV DOXYGEN_RELEASE=${DOXYGEN_RELEASE}
45+
WORKDIR /work
46+
RUN set -ex ;\
47+
DIST="https://www.doxygen.nl/files" ;\
48+
wget ${DIST}/doxygen-${DOXYGEN_RELEASE}.linux.bin.tar.gz -O doxygen.tar.gz ;\
49+
tar -xzf doxygen.tar.gz ;\
50+
cd doxygen-${DOXYGEN_RELEASE} ;\
51+
make install ;\
52+
cd /work ;\
53+
rm -rf doxygen.tar.gz doxygen-${DOXYGEN_RELEASE}
54+
4355
ARG ZNAI_RELEASE=1.73
4456
ENV ZNAI_RELEASE=${ZNAI_RELEASE}
4557
WORKDIR /work
@@ -56,9 +68,9 @@ ENV CXX=/usr/bin/g++
5668
ENV CMAKE_GENERATOR=Ninja
5769
ENV CMAKE_BUILD_TYPE=Debug
5870

59-
WORKDIR /work
6071
ARG CATCH_RELEASE=3.7.1
6172
ENV CATCH_RELEASE=${CATCH_RELEASE}
73+
WORKDIR /work
6274
RUN set -ex ;\
6375
git clone https://github.com/catchorg/Catch2.git ;\
6476
cd Catch2 ;\

0 commit comments

Comments
 (0)