Skip to content

Commit 937683b

Browse files
authored
Merge pull request #11514 from DefectDojo/master-into-bugfix/2.42.0-2.43.0-dev
Release: Merge back 2.42.0 into bugfix from: master-into-bugfix/2.42.0-2.43.0-dev
2 parents 0fe1e26 + a420681 commit 937683b

219 files changed

Lines changed: 1341 additions & 1535 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
with:
2424
persist-credentials: false
2525

@@ -28,14 +28,14 @@ jobs:
2828
run: echo "IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
2929

3030
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v3
31+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
3232
with:
3333
buildkitd-flags: --debug
3434
driver-opts: image=moby/buildkit:master # needed to get the fix for https://github.com/moby/buildkit/issues/2426
3535

3636
- name: Build
3737
id: docker_build
38-
uses: docker/build-push-action@v6
38+
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
3939
timeout-minutes: 10
4040
env:
4141
DOCKER_BUILD_CHECKS_ANNOTATIONS: false
@@ -49,7 +49,7 @@ jobs:
4949
# export docker images to be used in next jobs below
5050
- name: Upload image ${{ matrix.docker-image }} as artifact
5151
timeout-minutes: 10
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
5353
with:
5454
name: built-docker-image-${{ matrix.docker-image }}-${{ matrix.os }}
5555
path: ${{ matrix.docker-image }}-${{ matrix.os }}_img

.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@0.12.1
16+
- uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
1717
with:
1818
workflow_id: 'integration-tests.yml,k8s-testing.yml,unit-tests.yml'
1919
access_token: ${{ github.token }}

.github/workflows/detect-merge-conflicts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: check if prs are conflicted
19-
uses: eps1lon/actions-label-merge-conflict@v3
19+
uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
2020
with:
2121
dirtyLabel: "conflicts-detected"
2222
repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/fetch-oas.yml

Lines changed: 2 additions & 2 deletions
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@v4
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
with:
2727
ref: release/${{ env.release_version }}
2828

@@ -51,7 +51,7 @@ jobs:
5151
run: docker compose down
5252

5353
- name: Upload oas.${{ matrix.file-type }} as artifact
54-
uses: actions/upload-artifact@v4
54+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
5555
with:
5656
name: oas-${{ matrix.file-type }}
5757
path: oas.${{ matrix.file-type }}

.github/workflows/gh-pages.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Setup Hugo
16-
uses: peaceiris/actions-hugo@v3
16+
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1717
with:
1818
hugo-version: '0.125.3'
1919
extended: true
2020

2121
- name: Setup Node
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
2323
with:
2424
node-version: '22.5.1'
2525

2626
- name: Cache dependencies
27-
uses: actions/cache@v4
27+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
2828
with:
2929
path: ~/.npm
3030
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
3131
restore-keys: |
3232
${{ runner.os }}-node-
3333
3434
- name: Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636
with:
3737
submodules: recursive
3838
fetch-depth: 0
3939

4040
- name: Setup Pages
4141
id: pages
42-
uses: actions/configure-pages@v4
42+
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0 - use this after https://github.com/DefectDojo/django-DefectDojo/pull/11329
4343

4444
- name: Install dependencies
4545
run: cd docs && npm ci
@@ -51,7 +51,7 @@ jobs:
5151
run: cd docs && hugo --minify --gc --config config/production/hugo.toml
5252

5353
- name: Deploy
54-
uses: peaceiris/actions-gh-pages@v4
54+
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
5555
with: # publishes to the `gh-pages` branch by default
5656
github_token: ${{ secrets.GITHUB_TOKEN }}
5757
publish_dir: ./docs/public

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141

4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4545

4646
# load docker images from build jobs
4747
- name: Load images from artifacts
48-
uses: actions/download-artifact@v4
48+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
4949
with:
5050
path: built-docker-image
5151
pattern: built-docker-image-*

.github/workflows/k8s-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
os: debian
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636

3737
- name: Setup Minikube
38-
uses: manusa/actions-setup-minikube@v2.13.0
38+
uses: manusa/actions-setup-minikube@0e8062ceff873bd77979f39cf8fd3621416afe4d # v2.13.0
3939
with:
4040
minikube version: 'v1.33.1'
4141
kubernetes version: ${{ matrix.k8s }}
@@ -48,7 +48,7 @@ jobs:
4848
minikube status
4949
5050
- name: Load images from artifacts
51-
uses: actions/download-artifact@v4
51+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
5252
with:
5353
path: built-docker-image
5454
pattern: built-docker-image-*

.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@v4
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
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@v5.0.1
36+
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
3737
with:
3838
commit_user_name: "PlantUML_bot"
3939
commit_user_email: "noreply@defectdojo.org"

.github/workflows/pr-labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: "Autolabeler"
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/labeler@v5
18+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1919
with:
2020
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2121
sync-labels: true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222

2323
- name: Checkout from_branch branch
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
with:
2626
ref: ${{ github.event.inputs.from_branch }}
2727

@@ -45,7 +45,7 @@ jobs:
4545
run: git push origin HEAD:${NEW_BRANCH}
4646

4747
- name: Checkout release branch
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949
with:
5050
ref: ${{ env.NEW_BRANCH }}
5151

@@ -75,7 +75,7 @@ jobs:
7575
grep -H version helm/defectdojo/Chart.yaml
7676
7777
- name: Push version changes
78-
uses: stefanzweifel/git-auto-commit-action@v5.0.1
78+
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
7979
with:
8080
commit_user_name: "${{ env.GIT_USERNAME }}"
8181
commit_user_email: "${{ env.GIT_EMAIL }}"
@@ -88,7 +88,7 @@ jobs:
8888
- name: Create Pull Request
8989
env:
9090
REPO_ORG: ${{ env.repoorg }}
91-
uses: actions/github-script@v7
91+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
9292
with:
9393
github-token: ${{ secrets.GITHUB_TOKEN }}
9494
script: |

0 commit comments

Comments
 (0)