Skip to content

Commit d07c007

Browse files
MaffoochMaffooch
authored
Merge pull request DefectDojo#6130 from DefectDojo/release/2.9.0
Release: Merge release into master from: release/2.9.0
2 parents 45bb0ac + 6ec3cfc commit d07c007

File tree

106 files changed

+8334
-1567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+8334
-1567
lines changed

‎.github/workflows/flake8.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Checkout
1414
if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
# by default the pull_requst_target event checks out the base branch, i.e. dev
1717
# so we need to explicitly checkout the head of the PR
1818
# we use fetch-depth 0 to make sure the full history is checked out and we can compare against
@@ -28,7 +28,7 @@ jobs:
2828
- name: Checkout
2929
# for non PR runs we just checkout the default, which is a sha on a branch probably
3030
if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
3232

3333
# - uses: tayfun/flake8-your-pr@master
3434
- uses: valentijnscholten/flake8-your-pr@master

‎.github/workflows/gh-pages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
node-version: '12.x'
2626

2727
- name: Cache dependencies
28-
uses: actions/cache@v2
28+
uses: actions/cache@v3
2929
with:
3030
path: ~/.npm
3131
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
3232
restore-keys: |
3333
${{ runner.os }}-node-
3434
35-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v3
3636
with:
3737
persist-credentials: false
3838
submodules: recursive # Fetch the Docsy theme
@@ -45,7 +45,7 @@ jobs:
4545
# for dev we move everything into a subfolder, so the master version stays in the root
4646
- run: mkdir /tmp/dev && mv docs/public/* /tmp/dev/
4747

48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v3
4949
with:
5050
persist-credentials: false
5151
submodules: recursive # Fetch the Docsy theme

‎.github/workflows/integration-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# password: ${{ secrets.DOCKERHUB_TOKEN }}
3434

3535
- name: Checkout
36-
uses: actions/checkout@v2
36+
uses: actions/checkout@v3
3737
with:
3838
persist-credentials: false
3939

@@ -107,11 +107,11 @@ jobs:
107107
steps:
108108

109109
- name: Checkout
110-
uses: actions/checkout@v2
110+
uses: actions/checkout@v3
111111

112112
# load docker images from build jobs
113113
- name: Load images from artifacts
114-
uses: actions/download-artifact@v2
114+
uses: actions/download-artifact@v3
115115

116116
- name: Load docker images
117117
run: |-

‎.github/workflows/k8s-testing.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# password: ${{ secrets.DOCKERHUB_TOKEN }}
5555

5656
- name: Checkout
57-
uses: actions/checkout@v2
57+
uses: actions/checkout@v3
5858
with:
5959
persist-credentials: false
6060

@@ -66,7 +66,7 @@ jobs:
6666
uses: docker/setup-buildx-action@v1
6767

6868
- name: Cache Docker layers
69-
uses: actions/cache@v2
69+
uses: actions/cache@v3
7070
env:
7171
docker-image: ${{ matrix.docker-image }}
7272
with:
@@ -132,7 +132,7 @@ jobs:
132132
# username: ${{ secrets.DOCKERHUB_USERNAME }}
133133
# password: ${{ secrets.DOCKERHUB_TOKEN }}
134134
- name: Checkout
135-
uses: actions/checkout@v2
135+
uses: actions/checkout@v3
136136

137137
- name: Setup Minikube
138138
uses: manusa/[email protected]
@@ -147,7 +147,7 @@ jobs:
147147
minikube status
148148
149149
- name: Load images from artifacts
150-
uses: actions/download-artifact@v2
150+
uses: actions/download-artifact@v3
151151

152152
- name: Load docker images
153153
run: |-

‎.github/workflows/plantuml.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
UML_FILES: ".puml"
1414
steps:
1515
- name: Checkout Source
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
with:
1818
persist-credentials: false
1919

@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
args: -v -tpng ${{ steps.getfile.outputs.files }}
3535
- name: Push Local Changes
36-
uses: stefanzweifel/git-auto-commit-action@v4.13.1
36+
uses: stefanzweifel/git-auto-commit-action@v4.14.0
3737
with:
3838
commit_user_name: "PlantUML_bot"
3939
commit_user_email: "[email protected]"

‎.github/workflows/pr-labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
name: "Autolabeler"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/labeler@v3
15+
- uses: actions/labeler@v4
1616
with:
1717
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/release-1-create-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout from_branch branch
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v3
2424
with:
2525
ref: ${{ github.event.inputs.from_branch }}
2626
- name: Create release branch
@@ -39,7 +39,7 @@ jobs:
3939
if: "!startsWith('${{ github.event.inputs.from_branch }}', 'release/')"
4040
run: git push origin HEAD:${NEW_BRANCH}
4141
- name: Checkout release branch
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343
with:
4444
ref: ${{ env.NEW_BRANCH }}
4545
- name: Update version numbers in key files
@@ -68,7 +68,7 @@ jobs:
6868
grep -H version helm/defectdojo/Chart.yaml
6969
7070
- name: Push version changes
71-
uses: stefanzweifel/git-auto-commit-action@v4.13.1
71+
uses: stefanzweifel/git-auto-commit-action@v4.14.0
7272
with:
7373
commit_user_name: "${{ env.GIT_USERNAME }}"
7474
commit_user_email: "${{ env.GIT_EMAIL }}"

‎.github/workflows/release-2-tag-docker-push.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222
with:
2323
ref: master
2424
- name: Configure git
@@ -101,7 +101,7 @@ jobs:
101101
password: ${{ secrets.DOCKERHUB_TOKEN }}
102102

103103
- name: Checkout tag
104-
uses: actions/checkout@v2
104+
uses: actions/checkout@v3
105105
with:
106106
ref: ${{ github.event.inputs.release_number }}
107107

@@ -113,7 +113,7 @@ jobs:
113113
uses: docker/setup-buildx-action@v1
114114

115115
- name: Cache Docker layers
116-
uses: actions/cache@v2
116+
uses: actions/cache@v3
117117
env:
118118
docker-image: ${{ matrix.docker-image }}
119119
with:

‎.github/workflows/release-3-master-into-dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout master
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v3
2424
with:
2525
ref: master
2626
- name: Create merge back branch
@@ -33,7 +33,7 @@ jobs:
3333
- name: Push new branch
3434
run: git push origin HEAD:${NEW_BRANCH}
3535
- name: Checkout new branch
36-
uses: actions/checkout@v2
36+
uses: actions/checkout@v3
3737
with:
3838
ref: ${{ env.NEW_BRANCH }}
3939
- name: Update version numbers in key files
@@ -49,7 +49,7 @@ jobs:
4949
grep appVersion helm/defectdojo/Chart.yaml
5050
grep version components/package.json
5151
- name: Push version changes
52-
uses: stefanzweifel/git-auto-commit-action@v4.13.1
52+
uses: stefanzweifel/git-auto-commit-action@v4.14.0
5353
with:
5454
commit_user_name: "${{ env.GIT_USERNAME }}"
5555
commit_user_email: "${{ env.GIT_EMAIL }}"

‎.github/workflows/release-drafter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
update_release_draft:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: release-drafter/release-drafter@v5.18.1
22+
- uses: release-drafter/release-drafter@v5.19.0
2323
with:
2424
version: ${{github.event.inputs.version}}
2525
env:

0 commit comments

Comments
 (0)