Skip to content

Commit

Permalink
docs: Fix docs (#113)
Browse files Browse the repository at this point in the history
  • Loading branch information
ewuerger authored Oct 8, 2024
1 parent b3cf1db commit b7179fc
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 13 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
name: Docs

on:
pull_request:
push:
branches: ["main"]
workflow_dispatch:

jobs:
sphinx:
Expand All @@ -18,6 +20,8 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
cache: pip
cache-dependency-path: pyproject.toml
python-version: "3.12"
- name: Upgrade pip
run: |
Expand All @@ -26,8 +30,16 @@ jobs:
run: |
python -m pip install '.[docs]'
- name: Create docs
run: |
make -C docs html
env:
SPHINXOPTS: ${{ github.ref != 'refs/heads/master' && '-W' || '' }}
run: make -C docs html
- name: Upload built docs as artifact
uses: actions/upload-artifact@v4
with:
name: Documentation
path: docs/build/html
if-no-files-found: error
retention-days: 5
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Upgrade pip
run: |-
python -m pip install -U pip
- name: Install pre-commit
run: |-
python -m pip install pre-commit types-docutils
python -m pip install 'pre-commit<4.0.0' types-docutils
- name: Run Pre-Commit
run: |-
pre-commit run --all-files
pylint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Upgrade pip
Expand Down
7 changes: 4 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
# SPDX-License-Identifier: CC0-1.0

default_install_hook_types: [commit-msg, pre-commit]
default_stages: [commit, merge-commit]
default_stages: [pre-commit, pre-merge-commit]
minimum_pre_commit_version: 3.2.0
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -26,7 +27,7 @@ repos:
- id: fix-byte-order-marker
- id: trailing-whitespace
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
Expand Down
File renamed without changes
File renamed without changes.
6 changes: 3 additions & 3 deletions docs/source/pipeline templates/gitlab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ following template can be used inside the `.gitlab-ci.yml` file:

We highly recommend using the diagram cache as a separate job and defined it as a dependency in our template for that
reason. The diagram cache artifacts have to be included in the capella2polarion job and its path must be defined in the
`CAPELLA2POLARION_MODEL_JSON` variable. A `.gitlab-ci.yml` with a capella2polarion synchronization job could look like
`CAPELLA2POLARION_CAPELLA_MODEL` variable. A `.gitlab-ci.yml` with a capella2polarion synchronization job could look like
this:

.. code:: yaml
Expand All @@ -35,6 +35,6 @@ this:
CAPELLA_VERSION: 6.1.0
ENTRYPOINT: model.aird
CAPELLA2POLARION_PROJECT_ID: syncproj
CAPELLA2POLARION_MODEL_JSON: '{"path": "PATH_TO_CAPELLA", "diagram_cache": "./diagram_cache"}'
CAPELLA2POLARION_CONFIG: capella2polarion_config.yaml
CAPELLA2POLARION_CAPELLA_MODEL: '{"path": "PATH_TO_CAPELLA", "diagram_cache": "./diagram_cache"}'
CAPELLA2POLARION_SYNCHRONIZE_CONFIG: capella2polarion_config.yaml
CAPELLA2POLARION_DEBUG: 1

0 comments on commit b7179fc

Please sign in to comment.