From ff7607efb2b1f86faed09509c0c6d848455e4d56 Mon Sep 17 00:00:00 2001 From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:49:36 -0600 Subject: [PATCH 1/4] Update release drafter --- .github/workflows/fetch-oas.yml | 10 +++++----- .github/workflows/release-drafter.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/fetch-oas.yml b/.github/workflows/fetch-oas.yml index 7bf51bfcd2c..44692ddb5cb 100644 --- a/.github/workflows/fetch-oas.yml +++ b/.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: |- diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index b91717bd4f8..69ac395492c 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -27,7 +27,7 @@ jobs: 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 @@ -35,7 +35,7 @@ jobs: 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: From 9cfed1f52ba362d6ea340dc93401a34eeeb402f1 Mon Sep 17 00:00:00 2001 From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:00:20 -0600 Subject: [PATCH 2/4] Set job output for release drafter --- .github/workflows/release-drafter.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 69ac395492c..466dae96905 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -22,6 +22,8 @@ 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 @@ -39,7 +41,9 @@ jobs: 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 From 7d662df945f0398ec190bb2398c2f64f7c5f7b8f Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 29 Jan 2024 15:31:07 +0000 Subject: [PATCH 3/4] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 262ef7e6f3b..3f7fe72f6dc 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.31.0-dev", + "version": "2.30.4", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 9406e56f475..f5f755a23ad 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa -__version__ = '2.31.0-dev' +__version__ = '2.30.4' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 5e613350165..5ac25d323cc 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.31.0-dev" +appVersion: "2.30.4" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.107-dev +version: 1.6.107 icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From 3d8c891e5e2457c108010a307110138603537c33 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 29 Jan 2024 16:25:43 +0000 Subject: [PATCH 4/4] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 3f7fe72f6dc..262ef7e6f3b 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.30.4", + "version": "2.31.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index f5f755a23ad..9406e56f475 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa -__version__ = '2.30.4' +__version__ = '2.31.0-dev' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 5ac25d323cc..c723762ee51 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.30.4" +appVersion: "2.31.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.107 +version: 1.6.108-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap