Merge pull request contiki-ng#2825 from pjonsson/docker-doxygen

Update to Doxygen 1.10.0

Author: nfi

.github/workflows/build.yml

@@ -82,8 +82,8 @@ jobs:
       if: matrix.os == 'macos-latest'
       run: |
         brew install coreutils make mosquitto mtr rlwrap
-        # Doxygen 1.9.7 is broken with ifdefs again, install 1.9.4 which works.
-        wget https://raw.githubusercontent.com/Homebrew/homebrew-core/41828ee36b96e35b63b2a4c8cfc2df2c3728944a/Formula/doxygen.rb
+        # Doxygen version needs to be in sync with Doxyfile.
+        wget https://github.com/Homebrew/homebrew-core/raw/f434ee2dce9ae11b27d7450a7cfb7af775a47719/Formula/d/doxygen.rb
         brew install doxygen.rb
         rm doxygen.rb
         python3 -m pip -q install matplotlib

.readthedocs.yaml

@@ -10,9 +10,9 @@ build:
     python: "3.8"
   jobs:
     post_install:
-      - wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.9.4/doxygen-1.9.4.linux.bin.tar.gz/download -O doxygen-1.9.4.linux.bin.tar.gz
-      - tar zxf doxygen-1.9.4.linux.bin.tar.gz doxygen-1.9.4/bin/doxygen --strip-components 2 --one-top-level=tools/doxygen
-      - rm doxygen-1.9.4.linux.bin.tar.gz
+      - wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.10.0/doxygen-1.10.0.linux.bin.tar.gz/download -O doxygen.linux.bin.tar.gz
+      - tar xf doxygen.linux.bin.tar.gz doxygen-1.10.0/bin/doxygen --strip-components 2 --one-top-level=tools/doxygen
+      - rm doxygen.linux.bin.tar.gz
 
 python:
   install:

tools/docker/Dockerfile

@@ -151,10 +151,10 @@ COPY --chown=root:root files/remap-user.sh /usr/local/bin/remap-user.sh
 # Remove the PDF manual and html directory to reduce image size.
 # Use the most recent version of ccache to ensure it supports the compiler
 # versions in the docker image.
-RUN wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.9.4/doxygen-1.9.4.linux.bin.tar.gz/download -O doxygen-1.9.4.linux.bin.tar.gz && \
-    tar zxf doxygen-1.9.4.linux.bin.tar.gz -C ${HOME}/.local && \
-    rm -rf ${HOME}/.local/doxygen-1.9.4/html ${HOME}/.local/doxygen-1.9.4/*.pdf doxygen-1.9.4.linux.bin.tar.gz && \
-    (cd ${HOME}/.local/bin && ln -s ../doxygen-1.9.4/bin/doxygen .) && \
+RUN wget -nv https://sourceforge.net/projects/doxygen/files/rel-1.10.0/doxygen-1.10.0.linux.bin.tar.gz/download -O doxygen.linux.bin.tar.gz && \
+    tar zxf doxygen.linux.bin.tar.gz -C ${HOME}/.local && \
+    rm -rf ${HOME}/.local/doxygen-1.10.0/html ${HOME}/.local/doxygen-1.10.0/*.pdf doxygen.linux.bin.tar.gz && \
+    (cd ${HOME}/.local/bin && ln -s ../doxygen-1.10.0/bin/doxygen .) && \
     wget -nv https://github.com/ccache/ccache/releases/download/v4.8.2/ccache-4.8.2-linux-x86_64.tar.xz && \
     tar xf ccache-4.8.2-linux-x86_64.tar.xz -C ${HOME}/.local/bin --strip-components=1 ccache-4.8.2-linux-x86_64/ccache && \
     rm ccache-*-linux-x86_64.tar.xz