From 4b5dde6eaaaf30d6a199a783ddc419f82fcc5506 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Wed, 21 Dec 2022 12:41:16 -0600 Subject: [PATCH] Fix Doxygen workflow (#4372) --- .github/workflows/doxygen.yml | 11 +++++++++-- .github/workflows/nix.yml | 2 +- Builds/CMake/RippledDocs.cmake | 6 +++--- CMakeLists.txt | 7 ++++++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index 9a56185c52c..db98018753d 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -1,4 +1,5 @@ name: Build and publish Doxygen documentation +# To test this workflow, push your changes to your fork's `develop` branch. on: push: branches: @@ -11,12 +12,18 @@ jobs: image: docker://rippleci/rippled-ci-builder:2944b78d22db steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 + - name: check environment + run: | + echo ${PATH} | tr ':' '\n' + cmake --version + doxygen --version + env - name: build run: | mkdir build cd build - cmake -DBoost_NO_BOOST_CMAKE=ON .. + cmake -Donly_docs=TRUE .. cmake --build . --target docs --parallel $(nproc) - name: publish uses: peaceiris/actions-gh-pages@v3 diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index a37ea9f132a..34030b3429b 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -74,7 +74,7 @@ jobs: run: | mkdir ${build_dir} cd ${build_dir} - conan install .. --build missing --settings build_type=${{ matrix.configuration }} --profile:build default --profile:host default + conan install .. --build missing --settings build_type=${{ matrix.configuration }} - name: configure run: | cd ${build_dir} diff --git a/Builds/CMake/RippledDocs.cmake b/Builds/CMake/RippledDocs.cmake index 0ec02349c6c..857ebf39c9e 100644 --- a/Builds/CMake/RippledDocs.cmake +++ b/Builds/CMake/RippledDocs.cmake @@ -2,9 +2,9 @@ docs target (optional) #]===================================================================] -# Early return if the `docs` directory is missing, -# e.g. when we are building a Conan package. -if(NOT EXISTS docs) +option(with_docs "Include the docs target?" FALSE) + +if(NOT (with_docs OR only_docs)) return() endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index a3696e89d04..da2ea1a5307 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,12 @@ endif () include(RippledCompiler) include(RippledInterface) +option(only_docs "Include only the docs target?" FALSE) +include(RippledDocs) +if(only_docs) + return() +endif() + ### include(deps/Boost) @@ -119,5 +125,4 @@ include(RippledCore) include(RippledInstall) include(RippledCov) include(RippledMultiConfig) -include(RippledDocs) include(RippledValidatorKeys)