Skip to content

Commit

Permalink
Remove doxygen branch docs, logging fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew-Whitlock committed Nov 22, 2024
1 parent e0ce1f8 commit 73c3723
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
14 changes: 10 additions & 4 deletions .github/scripts/build-gh-pages.sh
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
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
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

0 comments on commit 73c3723

Please sign in to comment.