From 9c87b8c22aabc1f439e43af91a590c962adcfb43 Mon Sep 17 00:00:00 2001 From: Pierre Le Marre Date: Fri, 23 Jun 2023 11:23:18 +0200 Subject: [PATCH 1/2] Fix typo in ensure-stable-doc-urls.py --- scripts/ensure-stable-doc-urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ensure-stable-doc-urls.py b/scripts/ensure-stable-doc-urls.py index 27f8232ed..9111e49b1 100755 --- a/scripts/ensure-stable-doc-urls.py +++ b/scripts/ensure-stable-doc-urls.py @@ -166,7 +166,7 @@ def generate_redirections(registry_path: Path, doc_dir: Path): cool = False print( f"ERROR: missing canonical documentation page “{canonical}”. " - f"Please update “{registry_path}” using b{RELATIVE_SCRIPT_PATH}”." + f"Please update “{registry_path}” using {RELATIVE_SCRIPT_PATH}”." ) # Add a redirection page for alias in aliases: From e7bdbb98d2b38428ee071c15797411be8f9740d6 Mon Sep 17 00:00:00 2001 From: Pierre Le Marre Date: Fri, 23 Jun 2023 11:12:10 +0200 Subject: [PATCH 2/2] CI: Fix documentation generation for macOS - Force Doxygen version 1.9.6, because 1.9.7 breaks our doc cool URIs, i.e. our system that maintain stable doc pages via redirection. Associated issue in Doxygen: https://github.com/doxygen/doxygen/issues/10146 - Install graphviz to build the .dot files. --- .github/workflows/macos.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cde09890f..4392def6f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -24,7 +24,11 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade meson PyYAML - brew install libxml2 doxygen bison ninja + brew install libxml2 bison ninja graphviz + # HACK: force Doxygen version 1.9.6, because 1.9.7 breaks our cool URIs. + curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/d2267b9f2ad247bc9c8273eb755b39566a474a70/Formula/doxygen.rb + brew install --formula doxygen.rb + rm doxygen.rb brew link bison --force env: HOMEBREW_NO_AUTO_UPDATE: 1