Skip to content

Commit 6849db0

Browse files
authored
Merge branch 'main' into 201-add-guidelines-to-write-good-conformance-tests-for-k8s
2 parents 9ac54d1 + 418f8a1 commit 6849db0

File tree

15 files changed

+213
-134
lines changed

15 files changed

+213
-134
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
/standards/*/*.md
2020
/standards/*/*.mdx
2121
/standards/scs-*.yaml
22+
/user-docs/application-examples
2223

2324
# Dependencies
2425
node_modules

.markdownlint-cli2.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@
5555
"markdownlint-rule-search-replace",
5656
"markdownlint-rule-relative-links"
5757
],
58-
"ignores": ["node_modules", ".github", "docs"],
58+
"ignores": ["node_modules", ".github", "docs", "standards"],
5959
"globs": ["**/*.{md}"]
6060
}

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,8 @@ CD in your Terminal to the root directory of the cloned repository. Install all
2626
npm install
2727
npm start
2828
```
29+
30+
## Linting problems
31+
32+
The repository establishes commit hooks which check the files for correctness and style.
33+
Have a look at the [linting-guide](https://docs.scs.community/community/contribute/linting-guide/) to get detailed information.

community/contribute/linting-guide.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ The markdownlint rules are defined in the configuration file `.markdownlint-cli2
2121

2222
Additionally we use [markdownlint-rule-search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) for fixing
2323

24+
## Local Usage for development
25+
26+
```bash
27+
npm run lint:md <file>
28+
npm run fix:md <file>
29+
```
30+
2431
## Github Workflows
2532

2633
There are two actions running on every Pull Request on the `main` branch.

docs.package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,5 +135,11 @@
135135
"source": ["documentation/overview.md"],
136136
"target": "docs/turnkey-solution",
137137
"label": ""
138+
},
139+
{
140+
"repo": "SovereignCloudStack/opendesk-on-scs",
141+
"source": "docs/*",
142+
"target": "user-docs/application-examples",
143+
"label": "opendesk-on-scs"
138144
}
139145
]

docusaurus.config.js

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const config = {
99
tagline: 'Documentation and Community Platform for the Sovereign Cloud Stack',
1010
url: 'https://docs.scs.community',
1111
baseUrl: '/',
12-
onBrokenLinks: 'throw',
12+
onBrokenLinks: 'warn',
1313
onBrokenMarkdownLinks: 'warn',
1414
favicon: 'img/favicon.ico',
1515
markdown: {
@@ -81,6 +81,16 @@ const config = {
8181
// ... other options
8282
}
8383
],
84+
[
85+
'@docusaurus/plugin-content-docs',
86+
{
87+
id: 'user-docs',
88+
path: 'user-docs',
89+
routeBasePath: 'user-docs',
90+
sidebarPath: require.resolve('./sidebarsUserDocs.js')
91+
// ... other options
92+
}
93+
],
8494
[
8595
'@docusaurus/plugin-content-docs',
8696
{
@@ -120,6 +130,11 @@ const config = {
120130
label: 'For Contributors',
121131
position: 'left'
122132
},
133+
{
134+
to: '/user-docs',
135+
label: 'For Users',
136+
position: 'left'
137+
},
123138
{ to: '/community', label: 'Community', position: 'left' },
124139
{ to: '/docs/faq', label: 'FAQ', position: 'left' },
125140
{
@@ -194,12 +209,19 @@ const config = {
194209
// @ts-ignore
195210
({
196211
hashed: true,
197-
docsDir: ['docs', 'community', 'standards', 'contributor-docs'],
212+
docsDir: [
213+
'docs',
214+
'community',
215+
'standards',
216+
'contributor-docs',
217+
'user-docs'
218+
],
198219
docsRouteBasePath: [
199220
'docs',
200221
'community',
201222
'standards',
202-
'contributor-docs'
223+
'contributor-docs',
224+
'user-docs'
203225
]
204226
})
205227
]

package-lock.json

Lines changed: 57 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"write-translations": "docusaurus write-translations",
3030
"write-heading-ids": "docusaurus write-heading-ids",
3131
"typecheck": "tsc",
32-
"postinstall": "node getDocs.js && node populateStds.js && node populateCerts.js",
32+
"postinstall": "node getDocs.js && node populateStds.js && node populateCerts.js && node populateClouds.js",
3333
"test": "echo \"Error: no test specified\" && exit 1",
3434
"lint:md": "markdownlint-cli2 \"**/*.md\"",
3535
"fix:md": "markdownlint-cli2-fix \"**/*.md\"",
@@ -54,6 +54,7 @@
5454
"lint-staged": "^13.1.2",
5555
"markdownlint-cli2": "^0.7.1",
5656
"markdownlint-rule-search-replace": "^1.0.9",
57+
"node-fetch": "^2.7.0",
5758
"prettier": "^2.8.4",
5859
"prism-react-renderer": "^2.3.1",
5960
"react": "^18.2.0",

0 commit comments

Comments
 (0)