Skip to content

Commit

Permalink
Merge pull request DefectDojo#9183 from DefectDojo/master-into-dev/2.…
Browse files Browse the repository at this point in the history
…29.3-2.30.0-dev

Release: Merge back 2.29.3 into dev from: master-into-dev/2.29.3-2.30.0-dev
  • Loading branch information
Maffooch authored Dec 18, 2023
2 parents 6aca647 + d9f03de commit 175af25
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-3-master-into-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
There are no special instructions for upgrading to $minorv.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/$patchv) for the contents of the release.
" > docs/content/en/getting_started/upgrading/$minorv.md
git add docs/content/en/getting_started/upgrading/$minorv.md
if: endsWith(github.event.inputs.release_number_dev, '.0-dev')
if: endsWith(github.event.inputs.release_number_new, '.0') && endsWith(github.event.inputs.release_number_dev, '.0-dev')

- name: Push version changes
uses: stefanzweifel/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion helm/defectdojo/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "2.30.0-dev"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
version: 1.6.101-dev
version: 1.6.102-dev
icon: https://www.defectdojo.org/img/favicon.ico
maintainers:
- name: madchap
Expand Down

0 comments on commit 175af25

Please sign in to comment.