Release: Merge back 2.30.4 into bugfix from: master-into-bugfix/2.30.4-2.31.0-dev

.github/workflows/fetch-oas.yml

@@ -21,19 +21,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{github.event.inputs.version}}
+          ref: ${{ github.event.inputs.version }}
 
       - name: Load docker images
         run: |-
-             docker pull defectdojo/defectdojo-django:${{github.event.inputs.version}}-alpine
-             docker pull defectdojo/defectdojo-nginx:${{github.event.inputs.version}}-alpine
+             docker pull defectdojo/defectdojo-django:${{ github.event.inputs.version }}-alpine
+             docker pull defectdojo/defectdojo-nginx:${{ github.event.inputs.version }}-alpine
              docker images
 
       - name: Start Dojo
         run: docker-compose --profile postgres-redis --env-file ./docker/environments/postgres-redis.env up --no-deps -d postgres nginx uwsgi
         env:
-          DJANGO_VERSION: ${{github.event.inputs.version}}-alpine
-          NGINX_VERSION: ${{github.event.inputs.version}}-alpine
+          DJANGO_VERSION: ${{ github.event.inputs.version }}-alpine
+          NGINX_VERSION: ${{ github.event.inputs.version }}-alpine
 
       - name: Download OpenAPI Specifications
         run: |-

.github/workflows/release-drafter.yml

@@ -22,24 +22,28 @@ jobs:
   # If the following jobs fail, then we will at least have some release notes present
   update_release_draft:
     runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
       - name: Create Release
         id: create_release
         uses: release-drafter/release-drafter@v5.25.0
         with:
-          version: ${{github.event.inputs.version}}  
+          version: ${{ github.event.inputs.version }}  
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   # Generate the OAS schemas in another workflow
   oas-fetch:
     needs: update_release_draft
     uses: ./.github/workflows/fetch-oas.yml
     with:
-      version: ${{github.event.inputs.version}} 
+      version: ${{ github.event.inputs.version }} 
     secrets: inherit
   # Upload the OAS schemas to the release object
   add-oas-to-release:
-    needs: oas-fetch
+    needs: 
+      - update_release_draft
+      - oas-fetch
     runs-on: ubuntu-latest
     steps:
       - name: Load OAS files from artifacts
@@ -51,7 +55,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          upload_url: ${{ needs.update_release_draft.outputs.upload_url }}
           asset_path: ./oas-yaml/oas.yaml
           asset_name: oas.yaml
           asset_content_type: application/vnd.oai.openapi
@@ -62,7 +66,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          upload_url: ${{ needs.update_release_draft.outputs.upload_url }}
           asset_path: ./oas-json/oas.json
           asset_name: oas.json
           asset_content_type: application/json

helm/defectdojo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.31.0-dev"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.107-dev
+version: 1.6.108-dev
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap