From 551aa31390b4a4b90510dfa590799d8aef66d693 Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Thu, 31 Dec 2020 02:55:31 -0600 Subject: [PATCH] Add a CI check for doxygen issues. --- .github/workflows/ci-scripts/docker.sh | 3 +++ utils/CI/doxygen-check.sh | 12 ++++++++++++ utils/dockerbuilds/CI/Dockerfile-base-1804-master | 2 +- utils/dockerbuilds/CI/Dockerfile-base-2004-master | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100755 utils/CI/doxygen-check.sh diff --git a/.github/workflows/ci-scripts/docker.sh b/.github/workflows/ci-scripts/docker.sh index 83d42067d785..fdccddca9eda 100755 --- a/.github/workflows/ci-scripts/docker.sh +++ b/.github/workflows/ci-scripts/docker.sh @@ -136,6 +136,9 @@ fi execute "WML validation" ./utils/CI/schema_validation.sh execute "WML indentation check" checkindent +if [ "$IMAGE" != "1804" ]; then + execute "Doxygen check" ./utils/CI/doxygen-check.sh +fi execute "WML tests" ./run_wml_tests -g -v -c -t 20 execute "Play tests" ./utils/CI/play_test_executor.sh execute "Boost unit tests" ./utils/CI/test_executor.sh diff --git a/utils/CI/doxygen-check.sh b/utils/CI/doxygen-check.sh new file mode 100755 index 000000000000..83ec8e0c6d21 --- /dev/null +++ b/utils/CI/doxygen-check.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +doxygen Doxyfile > doxy-output.txt 2>&1 +LINES=`cat doxy-output.txt | wc -l` + +if [ "$LINES" == "0" ]; then + echo "No doxygen errors or warnings!" +else + echo "Found doxygen errors or warnings!" + cat doxy-output.txt + exit 1 +fi diff --git a/utils/dockerbuilds/CI/Dockerfile-base-1804-master b/utils/dockerbuilds/CI/Dockerfile-base-1804-master index 9c437431fc62..b6744e771871 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-1804-master +++ b/utils/dockerbuilds/CI/Dockerfile-base-1804-master @@ -23,6 +23,6 @@ RUN pip3 install --upgrade pip RUN yes | pip3 install paramiko # programs -RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang lld +RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang lld doxygen graphviz WORKDIR /home/wesnoth-travis diff --git a/utils/dockerbuilds/CI/Dockerfile-base-2004-master b/utils/dockerbuilds/CI/Dockerfile-base-2004-master index 58b0e731e3e5..f7553cc1e4e9 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-2004-master +++ b/utils/dockerbuilds/CI/Dockerfile-base-2004-master @@ -23,6 +23,6 @@ RUN pip3 install --upgrade pip RUN yes | pip3 install paramiko # programs -RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang lld +RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang lld doxygen graphviz WORKDIR /home/wesnoth-travis