From b727fdea88caf7694a2d9a5dd348bca867f9f4af Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Tue, 3 Jun 2025 14:53:18 +0200 Subject: [PATCH] CI: Remove deprecated windows-19, add windows-25 Also install Doxygen and graphviz on macOS systems to test documentation builds there. --- .github/actions/install-macos/action.yml | 4 +++- .github/workflows/ci.yml | 2 +- doc/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-macos/action.yml b/.github/actions/install-macos/action.yml index ce829ce..1a55bb2 100644 --- a/.github/actions/install-macos/action.yml +++ b/.github/actions/install-macos/action.yml @@ -6,5 +6,7 @@ runs: - name: Install homebrew packages run: | brew install \ - boost + boost \ + doxygen \ + graphviz shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b19020d..40b6e7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,8 +132,8 @@ jobs: fail-fast: false matrix: os: - - windows-2019 - windows-2022 + - windows-2025 steps: - uses: actions/checkout@v4 with: diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f07a838..f2aa572 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -11,7 +11,7 @@ message(STATUS "Configuring documentation") message(STATUS "Looking for doxygen") find_package(Doxygen) -if(DOXYGEN_FOUND) +if(DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND) message(STATUS "Looking for doxygen - found") configure_file(Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) file(GLOB HEADER_FILES "${CMAKE_SOURCE_DIR}/include/vtzero/*.hpp")