Skip to content

Commit

Permalink
Merge branch 'master' into feature/233-fix-values-partij-identificatoren
Browse files Browse the repository at this point in the history
  • Loading branch information
danielmursa-dev committed Dec 20, 2024
2 parents 1c9e1b9 + 1ce6afb commit d8e8384
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,18 @@ jobs:
id: image-name

open-api-ci:
uses: maykinmedia/open-api-workflows/.github/workflows/ci.yml@v1
uses: maykinmedia/open-api-workflows/.github/workflows/ci.yml@v3.0.2
needs:
- store-reusable-workflow-vars
with:
main-branch: 'master'
run-docs: true
python-version: '3.11'
docker-image-name: ${{ needs.store-reusable-workflow-vars.outputs.image-name }}
django-settings-module: openklant.conf.ci

open-api-publish:
uses: maykinmedia/open-api-workflows/.github/workflows/publish.yml@v1
uses: maykinmedia/open-api-workflows/.github/workflows/publish.yml@v3.0.2
needs:
- store-reusable-workflow-vars
- open-api-ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ name: "CodeQL"
on:
push:
branches:
- main
- master
pull_request:
# The branches below must be a subset of the branches above
branches:
- main
- master
schedule:
- cron: '0 23 * * 6'

Expand Down
8 changes: 5 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
None,
),
"django": (
"http://docs.djangoproject.com/en/3.2/",
"http://docs.djangoproject.com/en/3.2/_objects/",
"http://docs.djangoproject.com/en/4.2/",
"http://docs.djangoproject.com/en/4.2/_objects/",
),
}

Expand All @@ -77,7 +77,7 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_logo = "logo.svg"
# html_logo = "logo.svg"
html_theme = "sphinx_rtd_theme"

# Add any paths that contain custom static files (such as style sheets) here,
Expand All @@ -90,6 +90,8 @@

todo_include_todos = True

linkcheck_retries = 3

linkcheck_ignore = [
r"urn:*",
r"https?://.*\.gemeente.nl",
Expand Down

0 comments on commit d8e8384

Please sign in to comment.