Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove doxygen branch docs, logging fixes #75

Merged
merged 1 commit into from
Nov 22, 2024
+12 −7
Merged

Remove doxygen branch docs, logging fixes #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/scripts/build-gh-pages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@

set -e

#Run with sudo if not root user
SUDO=""
if [ $(id -u) -ne 0 ]; then
SUDO="sudo"
fi

echo "Installing apt packages"
sudo apt-get update >/dev/null
sudo apt-get install -y wget git cmake graphviz >/dev/null
$SUDO apt-get update >/dev/null
$SUDO apt-get install -y wget git cmake graphviz >/dev/null

echo "Installing Doxygen"
wget https://www.doxygen.nl/files/doxygen-1.12.0.linux.bin.tar.gz >/dev/null
wget -q https://www.doxygen.nl/files/doxygen-1.12.0.linux.bin.tar.gz
tar -xzf doxygen-1.12.0.linux.bin.tar.gz >/dev/null
export PATH="$PWD/doxygen-1.12.0/bin:$PATH"

#List of branches to build docs for
#TODO: Remove doxygen branch once tested
BRANCHES="doxygen master develop"
BRANCHES="master develop"

build-docs() (
git checkout $1
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- master
- develop
- doxygen # TODO: Remove after testing

#Only one of this workflow runs at a time
concurrency:
Expand Down
4 changes: 2 additions & 2 deletions doc/html/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ if("html" IN_LIST DOC_VERSIONS)
list(REMOVE_ITEM DOC_VERSIONS "html")
endif()

message(STATUS "Existing documentation versions: ${FENIX_DOC_VERSIONS}")

list(APPEND DOC_VERSIONS ${DOXYGEN_HTML_OUTPUT})
list(REMOVE_DUPLICATES DOC_VERSIONS)
list(SORT DOC_VERSIONS)
Expand All @@ -36,6 +34,8 @@ if("main" IN_LIST DOC_VERSIONS)
list(PREPEND DOC_VERSIONS "main")
endif()

message(STATUS "Documentation versions: ${DOC_VERSIONS}")

set(DOC_DEFAULT_VERSION "develop")
if(NOT DOC_DEFAULT_VERSION IN_LIST DOC_VERSIONS)
set(DOC_DEFAULT_VERSION ${FENIX_BRANCH})
Expand Down
Loading