From a0591cbc9313aa610c83618b016df3b10483a873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= Date: Tue, 11 Feb 2025 01:20:27 +0000 Subject: [PATCH] Fix doxygen-generated pages --- CMakeLists.txt | 3 ++- ci/deploy.gitlab-ci.yml | 12 ++++++++---- doc/Doxyfile.in | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02edc5594..1bff4ab63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,8 +109,9 @@ set(EIGEN_VERSION_NUMBER ${EIGEN_WORLD_VERSION}.${EIGEN_MAJOR_VERSION}.${EIGEN_M if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git) # if the git program is absent or this will leave the EIGEN_GIT_REVNUM string empty, # but won't stop CMake. - execute_process(COMMAND git ls-remote --refs -q ${CMAKE_SOURCE_DIR} HEAD OUTPUT_VARIABLE EIGEN_GIT_OUTPUT) + execute_process(COMMAND git ls-remote -q ${CMAKE_SOURCE_DIR} HEAD OUTPUT_VARIABLE EIGEN_GIT_OUTPUT) endif() + # extract the git rev number from the git output... if(EIGEN_GIT_OUTPUT) string(REGEX MATCH "^([0-9;a-f]+).*" EIGEN_GIT_CHANGESET_MATCH "${EIGEN_GIT_OUTPUT}") diff --git a/ci/deploy.gitlab-ci.yml b/ci/deploy.gitlab-ci.yml index 52b955790..0784fcb9b 100644 --- a/ci/deploy.gitlab-ci.yml +++ b/ci/deploy.gitlab-ci.yml @@ -15,21 +15,25 @@ deploy:tag:nightly: - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen" - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen" - # Upload docs if pipeline succeeded. +# Upload docs if pipeline succeeded. deploy:doc:nightly: stage: deploy image: busybox dependencies: [ build:linux:doc ] + variables: + PAGES_PREFIX: docs-nightly script: + - echo "Deploying site to $CI_PAGES_URL" - mv ${EIGEN_CI_BUILDDIR}/doc/html public - pages: true + pages: + path_prefix: $PAGES_PREFIX artifacts: name: "$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG" paths: - - public/ + - public tags: - - linux - eigen-runner + - linux rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen" - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen" diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 439336ce3..3d7165c37 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -160,6 +160,7 @@ EXPAND_AS_DEFINED = EIGEN_MAKE_TYPEDEFS \ TAGFILES = ${EIGEN_DOXY_TAGFILES} GENERATE_TAGFILE = ${Eigen_BINARY_DIR}/doc/${EIGEN_DOXY_PROJECT_NAME}.doxytags EXTERNAL_GROUPS = NO +EXTERNAL_PAGES = NO HIDE_UNDOC_RELATIONS = NO HAVE_DOT = YES COLLABORATION_GRAPH = NO @@ -172,3 +173,4 @@ DIRECTORY_GRAPH = NO DOT_GRAPH_MAX_NODES = 300 GENERATE_DEPRECATEDLIST = NO GENERATE_TODOLIST = NO +WARN_AS_ERROR = FAIL_ON_WARNINGS_PRINT