Skip to content

Commit e7c167f

Browse files
Merge branch 'master' into alexeyk/multi-arch-image
# Conflicts: # .github/workflows/ci.yml # .github/workflows/vuln-check.yml
2 parents 8b8114e + 24a34f3 commit e7c167f

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
158158
TRIVY_PLATFORM: linux/amd64
159159
- name: Upload amd64 Trivy results
160-
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
160+
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
161161
with:
162162
sarif_file: 'trivy-results-amd64.sarif'
163163
category: trivy-amd64
@@ -174,7 +174,7 @@ jobs:
174174
TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
175175
TRIVY_PLATFORM: linux/arm64
176176
- name: Upload arm64 Trivy results
177-
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
177+
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
178178
with:
179179
sarif_file: 'trivy-results-arm64.sarif'
180180
category: trivy-arm64

.github/workflows/create-test-mirror-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878

7979
- name: Push changes
8080
if: ${{ steps.create-commit.outputs.has_changes == 'true' }}
81-
uses: DataDog/commit-headless@ad3668640012ec69186398f43d61923f6878bbbe # action/v3.2.0
81+
uses: DataDog/commit-headless@567f7eedac58750aa573f48fd60cfe478abc65bd # action/v3.3.0
8282
with:
8383
target: DataDog/images
8484
token: "${{ steps.octo-sts.outputs.token }}"

.github/workflows/delete-test-mirror-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
working-directory: images
6565

6666
- name: Push changes
67-
uses: DataDog/commit-headless@ad3668640012ec69186398f43d61923f6878bbbe # action/v3.2.0
67+
uses: DataDog/commit-headless@567f7eedac58750aa573f48fd60cfe478abc65bd # action/v3.3.0
6868
with:
6969
target: DataDog/images
7070
token: "${{ steps.octo-sts.outputs.token }}"

.github/workflows/update-mirror-digests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595

9696
- name: Push changes
9797
if: ${{ steps.create-commit.outputs.has_changes == 'true' }}
98-
uses: DataDog/commit-headless@ad3668640012ec69186398f43d61923f6878bbbe # action/v3.2.0
98+
uses: DataDog/commit-headless@567f7eedac58750aa573f48fd60cfe478abc65bd # action/v3.3.0
9999
with:
100100
target: DataDog/images
101101
token: "${{ steps.octo-sts.outputs.token }}"

.github/workflows/vuln-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
TRIVY_PLATFORM: linux/amd64
4444

4545
- name: Upload amd64 Trivy scan results to GitHub Security tab
46-
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
46+
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
4747
if: always()
4848
with:
4949
sarif_file: 'trivy-results-amd64.sarif'
@@ -63,7 +63,7 @@ jobs:
6363
TRIVY_PLATFORM: linux/arm64
6464

6565
- name: Upload arm64 Trivy scan results to GitHub Security tab
66-
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
66+
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
6767
if: always()
6868
with:
6969
sarif_file: 'trivy-results-arm64.sarif'

0 commit comments

Comments
 (0)