Skip to content

Commit a41120e

Browse files
authored
Merge branch 'nginxinc:main' into patch-1
2 parents 0fcd95e + 2f627ce commit a41120e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
driver-opts: network=host
5252

5353
- name: Setup QEMU
54-
uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
54+
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
5555
with:
5656
platforms: arm64
5757

5858
- name: Login to GitHub Container Registry
59-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
59+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
6060
if: ${{ github.event_name != 'pull_request' && ! contains(inputs.image, 'plus') }}
6161
with:
6262
registry: ghcr.io
@@ -73,7 +73,7 @@ jobs:
7373
if: ${{ github.event_name != 'pull_request' && contains(inputs.image, 'plus')}}
7474

7575
- name: Login to NGINX Registry
76-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
76+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
7777
with:
7878
registry: docker-mgmt.nginx.com
7979
username: ${{ steps.idtoken.outputs.id_token }}
@@ -90,7 +90,7 @@ jobs:
9090
if: ${{ github.event_name != 'pull_request' && contains(inputs.image, 'plus') }}
9191

9292
- name: Login to GAR
93-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
93+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
9494
with:
9595
registry: us-docker.pkg.dev
9696
username: oauth2accesstoken
@@ -170,7 +170,7 @@ jobs:
170170
fail-build: false
171171

172172
- name: Upload scan result to GitHub Security tab
173-
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
173+
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
174174
continue-on-error: true
175175
with:
176176
sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ jobs:
292292
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
293293

294294
- name: Login to GitHub Container Registry
295-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
295+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
296296
with:
297297
registry: ghcr.io
298298
username: ${{ github.repository_owner }}

.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
55+
uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
5656
with:
5757
languages: ${{ matrix.language }}
5858
build-mode: ${{ matrix.build-mode }}
@@ -64,6 +64,6 @@ jobs:
6464
# queries: security-extended,security-and-quality
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
67+
uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
6868
with:
6969
category: "/language:${{matrix.language}}"

.github/workflows/scorecards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ jobs:
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
63+
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
6464
with:
6565
sarif_file: results.sarif

0 commit comments

Comments
 (0)