Skip to content

Commit 2d14c44

Browse files
committed
Test improvements for publish website
* Improve publishing (we need to test it) * Switch to using dev container * Update doxygen config * using docs-prerelease branch on fork Note new build now only publishes on `github-pages` rather than the previous `gh-pages` as causes issues with branch protection rules.
1 parent 073db6f commit 2d14c44

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

.devcontainer/flashcart/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "N64FlashcartMenu-sc64deployer",
2+
"name": "N64FlashcartMenu-flashcart-devcontainer",
33
"build": {
44
"dockerfile": "Dockerfile.sc64deployer"
55
},
Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
# Trigger the action on push to main
1+
# Trigger the action
22
on:
3+
pull_request:
34
push:
45
branches:
56
- main
7+
- develop
8+
- docs-prerelease
69

710
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
811
permissions:
@@ -20,29 +23,28 @@ jobs:
2023
publish-docs:
2124
environment:
2225
name: github-pages
23-
url: menu.summercart64.dev # url: ${{ steps.deployment.outputs.page_url }}
26+
url: ${{ steps.deployment.outputs.page_url }}/N64FlashcartMenu/
27+
2428
runs-on: ubuntu-latest
2529
steps:
2630
- name: Checkout
2731
uses: actions/checkout@v6
28-
- name: Dotnet Setup
29-
uses: actions/setup-dotnet@v5
30-
with:
31-
dotnet-version: 8.x
3232

33-
- name: Run Doxygen to generate API docs
34-
uses: mattnotmitt/doxygen-action@v1
33+
- name: Build N64FlashcartMenu ROM
34+
uses: devcontainers/[email protected]
3535
with:
36-
doxyfile-path: './Doxyfile'
37-
38-
- run: dotnet tool update -g docfx
39-
- run: docfx docfx.json
36+
configFile: .devcontainer/doc-builder/devcontainer.json
37+
runCmd: |
38+
doxygen
39+
docfx docfx.json
4040
4141
- name: Upload artifact
4242
uses: actions/upload-pages-artifact@v4
4343
with:
4444
# Upload entire docfx site folder
4545
path: '_site'
46+
4647
- name: Deploy to GitHub Pages
48+
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docs-prerelease'
4749
id: deployment
4850
uses: actions/deploy-pages@v4

Doxyfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,7 @@ WARN_AS_ERROR = NO
872872
# and the warning text. Optionally the format may contain $version, which will
873873
# be replaced by the version of the file (if it could be obtained via
874874
# FILE_VERSION_FILTER)
875+
# See also: WARN_LINE_FORMAT
875876
# The default value is: $file:$line: $text.
876877

877878
WARN_FORMAT = "$file:$line: $text"
@@ -905,7 +906,8 @@ WARN_LOGFILE =
905906
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
906907
# Note: If this tag is empty the current directory is searched.
907908

908-
INPUT = ./src/README.md ./src
909+
INPUT = ./src/README.md \
910+
./src
909911

910912
# This tag can be used to specify the character encoding of the source files
911913
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1155,23 +1157,23 @@ VERBATIM_HEADERS = YES
11551157
# generated with the -Duse_libclang=ON option for CMake.
11561158
# The default value is: NO.
11571159

1158-
#CLANG_ASSISTED_PARSING = NO
1160+
CLANG_ASSISTED_PARSING = NO
11591161

11601162
# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
11611163
# tag is set to YES then doxygen will add the directory of each input to the
11621164
# include path.
11631165
# The default value is: YES.
11641166
# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
11651167

1166-
#CLANG_ADD_INC_PATHS = NO
1168+
CLANG_ADD_INC_PATHS = YES
11671169

11681170
# If clang assisted parsing is enabled you can provide the compiler with command
11691171
# line options that you would normally use when invoking the compiler. Note that
11701172
# the include paths will already be set by doxygen for the files and directories
11711173
# specified with INPUT and INCLUDE_PATH.
11721174
# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
11731175

1174-
#CLANG_OPTIONS =
1176+
CLANG_OPTIONS =
11751177

11761178
# If clang assisted parsing is enabled you can provide the clang parser with the
11771179
# path to the directory containing a file called compile_commands.json. This
@@ -1184,7 +1186,7 @@ VERBATIM_HEADERS = YES
11841186
# Note: The availability of this option depends on whether or not doxygen was
11851187
# generated with the -Duse_libclang=ON option for CMake.
11861188

1187-
#CLANG_DATABASE_PATH =
1189+
CLANG_DATABASE_PATH =
11881190

11891191
#---------------------------------------------------------------------------
11901192
# Configuration options related to the alphabetical class index
@@ -1666,7 +1668,7 @@ FORMULA_FONTSIZE = 10
16661668
# The default value is: YES.
16671669
# This tag requires that the tag GENERATE_HTML is set to YES.
16681670

1669-
#FORMULA_TRANSPARENT = YES
1671+
FORMULA_TRANSPARENT = YES
16701672

16711673
# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
16721674
# to create new LaTeX commands to be used in formulas as building blocks. See
@@ -2280,8 +2282,8 @@ INCLUDE_FILE_PATTERNS =
22802282
# recursively expanded use the := operator instead of the = operator.
22812283
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
22822284

2283-
PREDEFINED = "__attribute__(x)= " \
2284-
"_Static_assert(c,s)= "
2285+
PREDEFINED = "__attribute__(x)=" \
2286+
"_Static_assert(c,s)="
22852287

22862288
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
22872289
# tag can be used to specify a list of macro names that should be expanded. The
@@ -2392,14 +2394,14 @@ DOT_NUM_THREADS = 0
23922394
# The default value is: Helvetica.
23932395
# This tag requires that the tag HAVE_DOT is set to YES.
23942396

2395-
#DOT_FONTNAME = Helvetica
2397+
DOT_FONTNAME = Helvetica
23962398

23972399
# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
23982400
# dot graphs.
23992401
# Minimum value: 4, maximum value: 24, default value: 10.
24002402
# This tag requires that the tag HAVE_DOT is set to YES.
24012403

2402-
#DOT_FONTSIZE = 10
2404+
DOT_FONTSIZE = 10
24032405

24042406
# By default doxygen will tell dot to use the default font as specified with
24052407
# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
@@ -2657,7 +2659,7 @@ MAX_DOT_GRAPH_DEPTH = 0
26572659
# The default value is: NO.
26582660
# This tag requires that the tag HAVE_DOT is set to YES.
26592661

2660-
#DOT_TRANSPARENT = NO
2662+
DOT_TRANSPARENT = NO
26612663

26622664
# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
26632665
# files in one run (i.e. multiple -o and -T options on the command line). This

0 commit comments

Comments
 (0)