Skip to content

Commit 32515b7

Browse files
committed
docs,ci: updated references to docs output
1 parent e6ecc1d commit 32515b7

File tree

6 files changed

+98
-9
lines changed

6 files changed

+98
-9
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,22 @@ jobs:
9090
- name: Build docs
9191
run: |
9292
dotnet tool install --global docfx --version "2.*"
93-
docfx Yubico.YubiKey/src/docfx.json --logLevel warning
93+
docfx docfx.json --logLevel warning --log docfx.log --warningsAsErrors
94+
95+
# Upload documentation log
96+
- name: "Save build artifacts: Docs log"
97+
uses: actions/upload-artifact@v4
98+
with:
99+
name: Documentation log
100+
path: docfx.log
101+
if-no-files-found: error
94102

95103
# Upload documentation
96104
- name: "Save build artifacts: Docs"
97105
uses: actions/upload-artifact@v4
98106
with:
99107
name: Documentation
100-
path: Yubico.YubiKey/docs/_site/
108+
path: docs/_site/
101109
if-no-files-found: error
102110

103111
# Upload NuGet packages

.github/workflows/upload-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/download-artifact@v4
3939
with:
4040
name: Documentation
41-
path: Yubico.YubiKey/docs/_site/
41+
path: docs/_site/
4242

4343
# Construct the docker image
4444
- name: Docker build

.vscode/tasks.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@
160160
{
161161
"label": "Build DocFX Documentation",
162162
"type": "shell",
163-
"command": "dotnet",
163+
"command": "docfx",
164164
"args": [
165-
"msbuild",
166-
"${workspaceFolder}/Yubico.YubiKey/src/Yubico.YubiKey.csproj",
167-
"/t:DocFXBuild",
165+
"docfx.json",
166+
"--log",
167+
"docfx.log"
168168
],
169169
"group": {
170170
"kind": "build",

contributordocs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ source: https://github.com/dotnet/runtime/blob/71f9191846292b61a93de54a18bdcac38
2121
This repo includes several documents relevant to contributors, including coding guidelines, workflow, design docs,
2222
and helpful resources.
2323

24-
For information about using the SDK, please refer to the [User's Manual](../Yubico.YubiKey/docs/users-manual/intro.md).
24+
For information about using the SDK, please refer to the [User's Manual](../docs/users-manual/intro.md).
2525

2626
- [Getting started](./getting-started.md)
2727
- [Useful links](./useful-links.md)

contributordocs/documentation-system/building-docs-and-running.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ generates documentation from comments in the source code. The comments are writt
1919
format.
2020

2121
In order to build the documentation, use either of the following methods:
22-
1. Command Line: `docfx build Yubico.YubiKey/src/docfx.json`
22+
1. Command Line: `docfx build jdocfx.json`
2323
2. VS Code: Run the build task `DocFXBuild` using [VS Code Tasks](https://code.visualstudio.com/docs/editor/tasks)
2424

2525
> Note: In order to run `docfx` commands, you need to have docfx installed. Install `docfx` using the following command: `dotnet tool install -g docfx`

docfx.json

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"metadata": [
3+
{
4+
"src": [
5+
{
6+
"files": ["Yubico.Core.csproj"],
7+
"src": "./Yubico.Core/src/",
8+
"exclude": ["**/bin/**", "**/obj/**"]
9+
}
10+
],
11+
"disableGitFeatures": true,
12+
"disableDefaultFilter": false,
13+
"memberLayout": "separatePages",
14+
"filter": "./docs/filterConfig.yml",
15+
"dest": "./docs/core-api",
16+
"properties": {
17+
"TargetFramework": "netstandard2.0"
18+
}
19+
},
20+
{
21+
"src": [
22+
{
23+
"files": ["Yubico.YubiKey.csproj"],
24+
"src": "./Yubico.YubiKey/src/",
25+
"exclude": ["**/bin/**", "**/obj/**"]
26+
}
27+
],
28+
"disableGitFeatures": true,
29+
"disableDefaultFilter": false,
30+
"memberLayout": "separatePages",
31+
"filter": "./docs/filterConfig.yml",
32+
"dest": "./docs/yubikey-api",
33+
"properties": {
34+
"TargetFramework": "netstandard2.0"
35+
}
36+
}
37+
],
38+
"build": {
39+
"content": [
40+
{
41+
"files": [
42+
"yubikey-api/**.yml",
43+
"yubikey-api/index.md",
44+
"core-api/**.yml",
45+
"core-api/index.md",
46+
"users-manual/**.md",
47+
"users-manual/**/toc.yml",
48+
"toc.yml",
49+
"*.md"
50+
],
51+
"src": "./docs/"
52+
}
53+
],
54+
"resource": [
55+
{
56+
"files": ["images/**"],
57+
"src": "./docs/"
58+
}
59+
],
60+
"overwrite": [
61+
{
62+
"files": ["namespaces/**.md"],
63+
"exclude": ["obj/**", "_site/**"],
64+
"src": "./docs/"
65+
}
66+
],
67+
"dest": "./docs/_site/",
68+
"globalMetadataFiles": [],
69+
"globalMetadata": {
70+
"_appFaviconPath": "images/favicon.ico"
71+
},
72+
"fileMetadataFiles": [],
73+
"template": ["default", "./docs/memberpage", "./docs/yubikeysdk-template"],
74+
"postProcessors": [],
75+
"markdownEngineName": "markdig",
76+
"noLangKeyword": false,
77+
"keepFileLink": false,
78+
"cleanupCacheHistory": false,
79+
"disableGitFeatures": false
80+
}
81+
}

0 commit comments

Comments
 (0)