Skip to content

Commit

Permalink
Merge pull request #259 from maykinmedia/release/2.2.1
Browse files Browse the repository at this point in the history
🔖 release 2.3.0
  • Loading branch information
Coperh authored Oct 4, 2024
2 parents 2699534 + a57f21c commit 6ef966d
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = False
tag = False
current_version = 2.2.0
current_version = 2.3.0

[bumpversion:file:README.rst]

Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,28 +160,28 @@ jobs:
path: image.tar
retention-days: 1

image_scan:
runs-on: ubuntu-latest
name: Scan docker image
needs:
- docker

steps:
- name: Download built image
uses: actions/download-artifact@v3
with:
name: docker-image
- name: Scan image with Trivy
uses: aquasecurity/trivy-action@master
with:
input: /github/workspace/image.tar # from download-artifact
format: 'sarif'
output: 'trivy-results-docker.sarif'
ignore-unfixed: true
- name: Upload results to GH Security tab
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results-docker.sarif'
# image_scan:
# runs-on: ubuntu-latest
# name: Scan docker image
# needs:
# - docker

# steps:
# - name: Download built image
# uses: actions/download-artifact@v3
# with:
# name: docker-image
# - name: Scan image with Trivy
# uses: aquasecurity/trivy-action@master
# with:
# input: /github/workspace/image.tar # from download-artifact
# format: 'sarif'
# output: 'trivy-results-docker.sarif'
# ignore-unfixed: true
# - name: Upload results to GH Security tab
# uses: github/codeql-action/upload-sarif@v3
# with:
# sarif_file: 'trivy-results-docker.sarif'

publish:
needs:
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,25 @@
Change history
==============

2.3.0
=====
*October 4, 2024*

**New features**

* [#236] add dynamic pagination with ``pageSize`` parameter

**Bugfixes/QoL**:

* [#258] Use correct API root in redoc OAS
* [#255] Fix API schema not showing caused by CSP errors
* [#255] Change SameSite session cookie to lax to fix OIDC login not working

2.2.0
=====

*September 5, 2024*

**New features**

* [#50] updated Python dependencies to minimize security risks.
Expand Down
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Open Klant
==========

:Version: 2.2.0
:Version: 2.3.0
:Source: https://github.com/maykinmedia/open-klant
:Keywords: klanten, klantinteracties, contactmomenten, api, common ground
:License: EUPL
Expand Down Expand Up @@ -39,10 +39,10 @@ Open Klant versie API versie Release datum API specificatie
================== ============== ============= ================
master/latest n/a n/a `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/master/src/openklant/components/klantinteracties/openapi.yaml>`_,
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/master/src/openklant/components/klantinteracties/openapi.yaml>`_,
(`diff <https://github.com/maykinmedia/open-klant/compare/2.2.0..master#diff-0198a3368d5c8c5325ef11e3c0ba8d2986f50b964c8002d3ece7cadc0b8ba23d>`_)
2.2.0 0.0.3+ 2024-09-05 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/2.2.0/src/openklant/components/klantinteracties/openapi.yaml>`_,
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/2.2.0/src/openklant/components/klantinteracties/openapi.yaml>`_,
(`diff <https://github.com/maykinmedia/open-klant/compare/2.1.0..2.2.0#diff-0198a3368d5c8c5325ef11e3c0ba8d2986f50b964c8002d3ece7cadc0b8ba23d>`_)
(`diff <https://github.com/maykinmedia/open-klant/compare/2.3.0..master#diff-0198a3368d5c8c5325ef11e3c0ba8d2986f50b964c8002d3ece7cadc0b8ba23d>`_)
2.3.0 0.0.3+ 2024-09-05 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/2.3.0/src/openklant/components/klantinteracties/openapi.yaml>`_,
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/2.3.0/src/openklant/components/klantinteracties/openapi.yaml>`_,
(`diff <https://github.com/maykinmedia/open-klant/compare/2.1.0..2.3.0#diff-0198a3368d5c8c5325ef11e3c0ba8d2986f50b964c8002d3ece7cadc0b8ba23d>`_)
2.1.0 0.0.3+ 2024-07-16 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/2.1.0/src/openklant/components/klantinteracties/openapi.yaml>`_,
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/open-klant/2.1.0/src/openklant/components/klantinteracties/openapi.yaml>`_,
(`diff <https://github.com/maykinmedia/open-klant/compare/2.0.0..2.1.0#diff-0198a3368d5c8c5325ef11e3c0ba8d2986f50b964c8002d3ece7cadc0b8ba23d>`_)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openklant",
"version": "2.2.0",
"version": "2.3.0",
"description": "openklant project",
"main": "src/static/openklant/js/openklant.js",
"directories": {
Expand Down
2 changes: 1 addition & 1 deletion src/openklant/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .celery import app as celery_app

__all__ = ("celery_app",)
__version__ = "2.2.0"
__version__ = "2.3.0"
__author__ = "Maykin"
__homepage__ = "https://github.com/maykinmedia/open-klant"

0 comments on commit 6ef966d

Please sign in to comment.