Skip to content

Commit 6b8227a

Browse files
authored
Merge pull request #14230 from DefectDojo/release/2.55.0
Release: Merge release into master from: release/2.55.0
2 parents 28275d6 + 85aba5f commit 6b8227a

671 files changed

Lines changed: 116656 additions & 7395 deletions

File tree

Some content is hidden

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

.github/workflows/build-docker-images-for-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
echo $GITHUB_ENV
4141
4242
- name: Checkout
43-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
43+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
with:
4545
persist-credentials: false
4646

.github/workflows/cancel-outdated-workflow-runs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 3
1515
steps:
16-
- uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
16+
- uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
1717
with:
1818
workflow_id: 'integration-tests.yml,k8s-testing.yml,unit-tests.yml'
1919
access_token: ${{ github.token }}

.github/workflows/fetch-oas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
file-type: [yaml, json]
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
ref: release/${{ env.release_version }}
2828

.github/workflows/gh-pages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ jobs:
2222
extended: true
2323

2424
- name: Setup Node
25-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
25+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2626
with:
27-
node-version: '24.12.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
27+
node-version: '24.13.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
2828

2929
- name: Cache dependencies
30-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
30+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
3131
with:
3232
path: ~/.npm
3333
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
3434
restore-keys: |
3535
${{ runner.os }}-node-
3636
3737
- name: Checkout
38-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3939
with:
4040
submodules: recursive
4141
fetch-depth: 0

.github/workflows/integration-tests.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,20 @@ jobs:
4141
"tests/notifications_test.py",
4242
"tests/tool_config.py",
4343
"openapi-validatator",
44-
4544
]
4645
os: [alpine, debian]
46+
v3_feature_locations: [true, false]
47+
exclude:
48+
# standalone create endpoint page is gone in v3
49+
- v3_feature_locations: true
50+
test-case: "tests/endpoint_test.py"
4751
fail-fast: false
52+
env:
53+
DD_V3_FEATURE_LOCATIONS: ${{ matrix.v3_feature_locations }}
4854

4955
steps:
5056
- name: Checkout
51-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
57+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5258

5359
# load docker images from build jobs
5460
- name: Load images from artifacts

.github/workflows/k8s-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
os: debian
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626

2727
- name: Setup Minikube
2828
uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0
2929
with:
30-
minikube version: 'v1.37.0' # renovate: datasource=github-releases depName=kubernetes/minikube
30+
minikube version: 'v1.38.0' # renovate: datasource=github-releases depName=kubernetes/minikube
3131
kubernetes version: ${{ matrix.k8s }}
3232
driver: docker
3333
start args: '--addons=ingress --cni calico'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
4141

4242
- name: Checkout from_branch branch
43-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
43+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
with:
4545
ref: ${{ inputs.from_branch }}
4646

@@ -58,7 +58,7 @@ jobs:
5858
run: git push origin HEAD:${NEW_BRANCH}
5959

6060
- name: Checkout release branch
61-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
61+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6262
with:
6363
ref: ${{ env.NEW_BRANCH }}
6464

@@ -93,7 +93,7 @@ jobs:
9393
grep -H version helm/defectdojo/Chart.yaml
9494
9595
- name: Run helm-docs
96-
uses: losisin/helm-docs-github-action@a57fae5676e4c55a228ea654a1bcaec8dd3cf5b5 # v1.6.2
96+
uses: losisin/helm-docs-github-action@6f957579ac122ecc167bf515fe84e828686c9a15 # v1.7.1
9797
with:
9898
chart-search-root: "helm/defectdojo"
9999

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
with:
2424
ref: master
2525

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
2424

2525
- name: Checkout master
26-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
26+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727
with:
2828
ref: master
2929

@@ -40,7 +40,7 @@ jobs:
4040
run: git push origin HEAD:${NEW_BRANCH}
4141

4242
- name: Checkout new branch
43-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
43+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
with:
4545
ref: ${{ env.NEW_BRANCH }}
4646

@@ -81,7 +81,7 @@ jobs:
8181
yq -i '.annotations."artifacthub.io/changes" = ""' helm/defectdojo/Chart.yaml
8282
8383
- name: Run helm-docs
84-
uses: losisin/helm-docs-github-action@a57fae5676e4c55a228ea654a1bcaec8dd3cf5b5 # v1.6.2
84+
uses: losisin/helm-docs-github-action@6f957579ac122ecc167bf515fe84e828686c9a15 # v1.7.1
8585
with:
8686
chart-search-root: "helm/defectdojo"
8787

@@ -115,7 +115,7 @@ jobs:
115115
run: echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
116116

117117
- name: Checkout master
118-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
118+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
119119
with:
120120
ref: master
121121

@@ -132,7 +132,7 @@ jobs:
132132
run: git push origin HEAD:${NEW_BRANCH}
133133

134134
- name: Checkout new branch
135-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
135+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
136136
with:
137137
ref: ${{ env.NEW_BRANCH }}
138138

@@ -157,7 +157,7 @@ jobs:
157157
yq -i '.annotations."artifacthub.io/changes" = ""' helm/defectdojo/Chart.yaml
158158
159159
- name: Run helm-docs
160-
uses: losisin/helm-docs-github-action@a57fae5676e4c55a228ea654a1bcaec8dd3cf5b5 # v1.6.2
160+
uses: losisin/helm-docs-github-action@6f957579ac122ecc167bf515fe84e828686c9a15 # v1.7.1
161161
with:
162162
chart-search-root: "helm/defectdojo"
163163

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- name: Create Release
2929
id: create_release
30-
uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
30+
uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6.2.0
3131
with:
3232
version: ${{ inputs.version }}
3333
env:

0 commit comments

Comments
 (0)