Skip to content

Commit

Permalink
Merge branch 'main' into 201-add-guidelines-to-write-good-conformance…
Browse files Browse the repository at this point in the history
…-tests-for-k8s
  • Loading branch information
garloff authored Nov 4, 2024
2 parents 9ac54d1 + 418f8a1 commit 6849db0
Show file tree
Hide file tree
Showing 15 changed files with 213 additions and 134 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
/standards/*/*.md
/standards/*/*.mdx
/standards/scs-*.yaml
/user-docs/application-examples

# Dependencies
node_modules
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint-cli2.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
"markdownlint-rule-search-replace",
"markdownlint-rule-relative-links"
],
"ignores": ["node_modules", ".github", "docs"],
"ignores": ["node_modules", ".github", "docs", "standards"],
"globs": ["**/*.{md}"]
}
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ CD in your Terminal to the root directory of the cloned repository. Install all
npm install
npm start
```

## Linting problems

The repository establishes commit hooks which check the files for correctness and style.
Have a look at the [linting-guide](https://docs.scs.community/community/contribute/linting-guide/) to get detailed information.
7 changes: 7 additions & 0 deletions community/contribute/linting-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ The markdownlint rules are defined in the configuration file `.markdownlint-cli2

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

## Local Usage for development

```bash
npm run lint:md <file>
npm run fix:md <file>
```

## Github Workflows

There are two actions running on every Pull Request on the `main` branch.
Expand Down
6 changes: 6 additions & 0 deletions docs.package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,11 @@
"source": ["documentation/overview.md"],
"target": "docs/turnkey-solution",
"label": ""
},
{
"repo": "SovereignCloudStack/opendesk-on-scs",
"source": "docs/*",
"target": "user-docs/application-examples",
"label": "opendesk-on-scs"
}
]
28 changes: 25 additions & 3 deletions docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const config = {
tagline: 'Documentation and Community Platform for the Sovereign Cloud Stack',
url: 'https://docs.scs.community',
baseUrl: '/',
onBrokenLinks: 'throw',
onBrokenLinks: 'warn',
onBrokenMarkdownLinks: 'warn',
favicon: 'img/favicon.ico',
markdown: {
Expand Down Expand Up @@ -81,6 +81,16 @@ const config = {
// ... other options
}
],
[
'@docusaurus/plugin-content-docs',
{
id: 'user-docs',
path: 'user-docs',
routeBasePath: 'user-docs',
sidebarPath: require.resolve('./sidebarsUserDocs.js')
// ... other options
}
],
[
'@docusaurus/plugin-content-docs',
{
Expand Down Expand Up @@ -120,6 +130,11 @@ const config = {
label: 'For Contributors',
position: 'left'
},
{
to: '/user-docs',
label: 'For Users',
position: 'left'
},
{ to: '/community', label: 'Community', position: 'left' },
{ to: '/docs/faq', label: 'FAQ', position: 'left' },
{
Expand Down Expand Up @@ -194,12 +209,19 @@ const config = {
// @ts-ignore
({
hashed: true,
docsDir: ['docs', 'community', 'standards', 'contributor-docs'],
docsDir: [
'docs',
'community',
'standards',
'contributor-docs',
'user-docs'
],
docsRouteBasePath: [
'docs',
'community',
'standards',
'contributor-docs'
'contributor-docs',
'user-docs'
]
})
]
Expand Down
71 changes: 57 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"write-translations": "docusaurus write-translations",
"write-heading-ids": "docusaurus write-heading-ids",
"typecheck": "tsc",
"postinstall": "node getDocs.js && node populateStds.js && node populateCerts.js",
"postinstall": "node getDocs.js && node populateStds.js && node populateCerts.js && node populateClouds.js",
"test": "echo \"Error: no test specified\" && exit 1",
"lint:md": "markdownlint-cli2 \"**/*.md\"",
"fix:md": "markdownlint-cli2-fix \"**/*.md\"",
Expand All @@ -54,6 +54,7 @@
"lint-staged": "^13.1.2",
"markdownlint-cli2": "^0.7.1",
"markdownlint-rule-search-replace": "^1.0.9",
"node-fetch": "^2.7.0",
"prettier": "^2.8.4",
"prism-react-renderer": "^2.3.1",
"react": "^18.2.0",
Expand Down
Loading

0 comments on commit 6849db0

Please sign in to comment.