From 3c7596f0ffe715c7ecade88b9ebb2126b80a9d20 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 2 Jul 2022 16:10:21 +0200 Subject: [PATCH] Switch to using Doxygen 1.9.1 for the documentation generation This fixes the problem with empty descriptions in the annotated class list and is a prerequisite for using custom CSS theme in the upcoming commits. Closes #22288. --- .github/workflows/docs_update.yml | 2 +- docs/doxygen/regen.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docs_update.yml b/.github/workflows/docs_update.yml index 29a13ba639..277014cc05 100644 --- a/.github/workflows/docs_update.yml +++ b/.github/workflows/docs_update.yml @@ -23,7 +23,7 @@ permissions: jobs: update: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: Update Online Documentation steps: diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh index cc312dbfed..6adfe2e3ab 100755 --- a/docs/doxygen/regen.sh +++ b/docs/doxygen/regen.sh @@ -41,11 +41,9 @@ fi # Still allow using incompatible version if explicitly requested. if [[ -z $WX_SKIP_DOXYGEN_VERSION_CHECK ]]; then doxygen_version=`$DOXYGEN --version` - # Note: remove the hack for Doxygen 1.8.19 below when changing this to a - # later version. - doxygen_version_required=1.8.17 + doxygen_version_required=1.9.1 if [[ $doxygen_version != $doxygen_version_required ]]; then - echo "Doxygen version $doxygen_version is not supported." + echo "Doxygen version $doxygen_version is not officially supported." echo "Please use Doxygen $doxygen_version_required or export WX_SKIP_DOXYGEN_VERSION_CHECK." exit 1 fi