Skip to content

Commit c1d8dd5

Browse files
Remove doxygen branch docs, logging fixes
1 parent 7c58ad8 commit c1d8dd5

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

Diff for: .github/scripts/build-gh-pages.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,24 @@
33

44
set -e
55

6+
#Run with sudo if not root user
7+
SUDO=""
8+
if [ $(id -u) -ne 0 ]; then
9+
SUDO="sudo"
10+
fi
11+
612
echo "Installing apt packages"
7-
sudo apt-get update >/dev/null
8-
sudo apt-get install -y wget git cmake graphviz >/dev/null
13+
$SUDO apt-get update >/dev/null
14+
$SUDO apt-get install -y wget git cmake graphviz >/dev/null
915

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

1521
#List of branches to build docs for
1622
#TODO: Remove doxygen branch once tested
17-
BRANCHES="doxygen master develop"
23+
BRANCHES="master develop"
1824

1925
build-docs() (
2026
git checkout $1

Diff for: .github/workflows/docs.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- master
77
- develop
8-
- doxygen # TODO: Remove after testing
98

109
#Only one of this workflow runs at a time
1110
concurrency:

Diff for: doc/html/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ if("html" IN_LIST DOC_VERSIONS)
2626
list(REMOVE_ITEM DOC_VERSIONS "html")
2727
endif()
2828

29-
message(STATUS "Existing documentation versions: ${FENIX_DOC_VERSIONS}")
30-
3129
list(APPEND DOC_VERSIONS ${DOXYGEN_HTML_OUTPUT})
3230
list(REMOVE_DUPLICATES DOC_VERSIONS)
3331
list(SORT DOC_VERSIONS)
@@ -36,6 +34,8 @@ if("main" IN_LIST DOC_VERSIONS)
3634
list(PREPEND DOC_VERSIONS "main")
3735
endif()
3836

37+
message(STATUS "Documentation versions: ${DOC_VERSIONS}")
38+
3939
set(DOC_DEFAULT_VERSION "develop")
4040
if(NOT DOC_DEFAULT_VERSION IN_LIST DOC_VERSIONS)
4141
set(DOC_DEFAULT_VERSION ${FENIX_BRANCH})

0 commit comments

Comments
 (0)