Skip to content

Commit 4f4b1db

Browse files
frantsaofrantsao
authored
Merge branch 'main' into issue-6679
2 parents 8d64188 + 78a6d60 commit 4f4b1db

37 files changed

+117
-117
lines changed

‎.github/workflows/build-base-images.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
image_matrix_nap: ${{ steps.vars.outputs.image_matrix_nap }}
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333

3434
- name: Output Variables
3535
id: vars
@@ -55,7 +55,7 @@ jobs:
5555
matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_oss ) }}
5656
steps:
5757
- name: Checkout Repository
58-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
58+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5959

6060
- name: Docker Buildx
6161
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
@@ -120,7 +120,7 @@ jobs:
120120
matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_plus ) }}
121121
steps:
122122
- name: Checkout Repository
123-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
123+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
124124

125125
- name: Docker Buildx
126126
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
@@ -188,7 +188,7 @@ jobs:
188188
matrix: ${{ fromJSON( needs.checks.outputs.image_matrix_nap ) }}
189189
steps:
190190
- name: Checkout Repository
191-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
191+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
192192

193193
- name: Docker Buildx
194194
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1

‎.github/workflows/build-oss.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
image_digest: ${{ steps.build-push.outputs.digest }}
5353
steps:
5454
- name: Checkout Repository
55-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
55+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5656
with:
5757
ref: ${{ inputs.branch }}
5858
fetch-depth: 0
@@ -147,7 +147,7 @@ jobs:
147147
echo "full-build: ${{ inputs.full-build }}"
148148
149149
- name: Fetch Cached Artifacts
150-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
150+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
151151
with:
152152
path: ${{ github.workspace }}/dist
153153
key: nginx-ingress-${{ inputs.go-md5 }}

‎.github/workflows/build-ot-dependency.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
os: [debian, alpine]
3434
steps:
3535
- name: Checkout Repository
36-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
36+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737
with:
3838
repository: opentracing-contrib/nginx-opentracing
3939
ref: master

‎.github/workflows/build-plus.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-24.04
5555
steps:
5656
- name: Checkout Repository
57-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
57+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5858
with:
5959
ref: ${{ inputs.branch }}
6060
fetch-depth: 0
@@ -160,7 +160,7 @@ jobs:
160160
echo "full-build: ${{ inputs.full-build }}"
161161
162162
- name: Fetch Cached Artifacts
163-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
163+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
164164
with:
165165
path: ${{ github.workspace }}/dist
166166
key: nginx-ingress-${{ inputs.go-md5 }}

‎.github/workflows/build-single-image.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-24.04
4646
steps:
4747
- name: Checkout Repository
48-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949
with:
5050
ref: ${{ inputs.branch }}
5151
fetch-depth: 0
@@ -57,7 +57,7 @@ jobs:
5757
cat $GITHUB_OUTPUT
5858
5959
- name: Setup Golang Environment
60-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
60+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
6161
with:
6262
go-version-file: go.mod
6363

@@ -91,7 +91,7 @@ jobs:
9191

9292
- name: Fetch Cached Binary Artifacts
9393
id: binary-cache
94-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
94+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
9595
with:
9696
path: ${{ github.workspace }}/dist
9797
key: nginx-ingress-${{ steps.vars.outputs.go_code_md5 }}

‎.github/workflows/build-test-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-24.04
2929
steps:
3030
- name: Checkout Repository
31-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232

3333
- name: Docker Buildx
3434
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1

‎.github/workflows/build-ubi-dependency.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
target_exists: ${{ steps.var.outputs.target_image_exists }}
4444
steps:
4545
- name: Checkout Repository
46-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
46+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747

4848
- name: Login to GitHub Container Registry
4949
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -89,7 +89,7 @@ jobs:
8989
fail-fast: false
9090
steps:
9191
- name: Checkout Repository
92-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
92+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9393

9494
- name: Setup QEMU
9595
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

‎.github/workflows/cache-update.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
image_matrix_nap: ${{ steps.vars.outputs.image_matrix_nap }}
2727
steps:
2828
- name: Checkout Repository
29-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030

3131
- name: Output Variables
3232
id: vars

‎.github/workflows/cherry-pick.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: ${{ (contains(github.event.pull_request.labels.*.name, 'dependencies') || contains(github.event.pull_request.labels.*.name, 'needs cherry pick')) && github.event.pull_request.merged == true }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
21+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
with:
2323
fetch-depth: 0
2424
token: ${{ secrets.NGINX_PAT }}

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
image_matrix_nap: ${{ steps.vars.outputs.image_matrix_nap }}
5454
steps:
5555
- name: Checkout Repository
56-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
56+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5757
with:
5858
fetch-depth: 0
5959

@@ -80,7 +80,7 @@ jobs:
8080
shell: bash --noprofile --norc -o pipefail {0}
8181

8282
- name: Setup Golang Environment
83-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
83+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
8484
with:
8585
go-version-file: go.mod
8686

@@ -119,7 +119,7 @@ jobs:
119119
120120
- name: Fetch Cached Binary Artifacts
121121
id: binary-cache
122-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
122+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
123123
with:
124124
path: ${{ github.workspace }}/dist
125125
key: nginx-ingress-${{ steps.vars.outputs.go_code_md5 }}
@@ -177,10 +177,10 @@ jobs:
177177
needs: checks
178178
steps:
179179
- name: Checkout Repository
180-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
180+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
181181

182182
- name: Setup Golang Environment
183-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
183+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
184184
with:
185185
go-version-file: go.mod
186186

@@ -214,10 +214,10 @@ jobs:
214214
needs: checks
215215
steps:
216216
- name: Checkout Repository
217-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
217+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
218218

219219
- name: Setup Golang Environment
220-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
220+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
221221
with:
222222
go-version-file: go.mod
223223
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
@@ -250,12 +250,12 @@ jobs:
250250
issues: write # for goreleaser/goreleaser-action to close milestone
251251
steps:
252252
- name: Checkout Repository
253-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
253+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
254254
with:
255255
fetch-depth: 0
256256

257257
- name: Setup Golang Environment
258-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
258+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
259259
with:
260260
go-version-file: go.mod
261261
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
@@ -280,7 +280,7 @@ jobs:
280280
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
281281

282282
- name: Store Artifacts in Cache
283-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
283+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
284284
with:
285285
path: ${{ github.workspace }}/dist
286286
key: nginx-ingress-${{ needs.checks.outputs.go_code_md5 }}
@@ -399,7 +399,7 @@ jobs:
399399
id-token: write
400400
steps:
401401
- name: Checkout Repository
402-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
402+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
403403

404404
- name: Authenticate to Google Cloud
405405
id: auth
@@ -432,7 +432,7 @@ jobs:
432432
if: ${{ ( needs.checks.outputs.forked_workflow == 'false' || needs.checks.outputs.docs_only == 'false' ) && steps.stable_exists.outputs.exists != 'true' }}
433433

434434
- name: Fetch Cached Artifacts
435-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
435+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
436436
with:
437437
path: ${{ github.workspace }}/dist
438438
key: nginx-ingress-${{ needs.checks.outputs.go_code_md5 }}
@@ -524,7 +524,7 @@ jobs:
524524
matrix_nap: ${{ steps.set-matrix.outputs.matrix_nap }}
525525
steps:
526526
- name: Checkout Repository
527-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
527+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
528528

529529
- id: set-matrix
530530
run: |

0 commit comments

Comments
 (0)