Skip to content

Commit

Permalink
Merge pull request #4 from NewTec-GmbH/feature/mermaid_11.2.1
Browse files Browse the repository at this point in the history
Feature/mermaid 11.2.1, Node 20 and Ubuntu 22.04
  • Loading branch information
nhjschulz authored Oct 10, 2024
2 parents 435b32e + 52062ba commit e5ea117
Show file tree
Hide file tree
Showing 11 changed files with 2,232 additions and 938 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# The introduction just shows some useful informations.
intro:
# The type of runner that the job will run on.
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# Steps represent a sequence of tasks that will be executed as part of the job.
steps:
- run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
Expand All @@ -28,7 +28,7 @@ jobs:
# The build job will build the documentation.
build:
# The type of runner that the job will run on.
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: intro
permissions:
contents: write
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'
cache: npm

- name: Install dependencies
Expand Down
11 changes: 6 additions & 5 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@

extensions = [
"sphinxcontrib.mermaid", # Mermaid diagrams
"myst_parser", # MyST markdown parser
"sphinx_rtd_dark_mode", # Dark mode
"sphinx_copybutton", # Copy button
"sphinx_togglebutton" # Toggle button
"sphinxcontrib.plantuml", # Plantuml diagrams
"myst_parser", # MyST markdown parser
"sphinx_rtd_dark_mode", # Dark mode
"sphinx_copybutton", # Copy button
"sphinx_togglebutton" # Toggle button
]

templates_path = ["_templates"]
Expand Down Expand Up @@ -59,7 +60,7 @@
mermaid_cmd_shell = "true"

# MyST configuration
myst_enable_extensions = ["colon_fence"]
myst_enable_extensions = ["colon_fence", 'attrs_block']
myst_heading_anchors = 2

# Toggle button configuration
Expand Down
6 changes: 6 additions & 0 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,9 @@ This documentation is intended to introduce the overall branching strategy to be
merge bugfix/Button
checkout main
merge release/v3.0.x tag: "v3.0.0"

.. toctree::
:caption: Submodule Config Management:
:maxdepth: 2

versioning/submod_versioning.md
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/versioning/images/gitmodule_entry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/versioning/images/gitmodules_diffs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/versioning/images/submodule_versioning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e5ea117

Please sign in to comment.