Skip to content

Commit 54bfd1c

Browse files
haywoodshhaywoodsh
authored
Merge branch 'main' into feat/support-foreign-upstreams
2 parents 4d9b240 + b90ad21 commit 54bfd1c

File tree

36 files changed

+184
-177
lines changed

36 files changed

+184
-177
lines changed

‎.github/scripts/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ cryptography==46.0.3 \
267267
--hash=sha256:ef639cb3372f69ec44915fafcd6698b6cc78fbe0c2ea41be867f6ed612811963 \
268268
--hash=sha256:f260d0d41e9b4da1ed1e0f1ce571f97fe370b152ab18778e9e8f67d6af432018
269269
# via pyjwt
270-
deprecated==1.2.18 \
271-
--hash=sha256:422b6f6d859da6f2ef57857761bfb392480502a64c3028ca9bbe86085d72115d \
272-
--hash=sha256:bd5011788200372a32418f888e326a09ff80d0214bd961147cfed01b5c018eec
270+
Deprecated==1.3.1 \
271+
--hash=sha256:597bfef186b6f60181535a29fbe44865ce137a5079f295b479886c82729d5f3f \
272+
--hash=sha256:b1b50e0ff0c1fddaa5708a2c6b0a6588bb09b892825ab2b214ac9ea9d92a5223
273273
# via pygithub
274274
idna==3.11 \
275275
--hash=sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea \

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
6262

6363
- name: Setup QEMU
64-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
64+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
6565
with:
6666
platforms: arm64
6767

@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Docker meta
8484
id: meta
85-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
85+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
8686
with:
8787
images: |
8888
name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/oss
@@ -126,7 +126,7 @@ jobs:
126126
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
127127

128128
- name: Setup QEMU
129-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
129+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
130130
with:
131131
platforms: arm64
132132

@@ -147,7 +147,7 @@ jobs:
147147

148148
- name: Docker meta
149149
id: meta
150-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
150+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
151151
with:
152152
images: |
153153
name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus
@@ -217,7 +217,7 @@ jobs:
217217

218218
- name: Docker meta
219219
id: meta
220-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
220+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
221221
with:
222222
images: |
223223
name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787

8888
- name: Docker meta
8989
id: meta
90-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
90+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
9191
with:
9292
context: workflow
9393
images: |
@@ -124,7 +124,7 @@ jobs:
124124
if: ${{ inputs.authenticated && ! inputs.full-build }}
125125

126126
- name: Setup QEMU
127-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
127+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
128128
with:
129129
platforms: arm64
130130
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898

9999
- name: Docker meta
100100
id: meta
101-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
101+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
102102
with:
103103
images: |
104104
name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic${{ contains(inputs.nap-modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap-modules, 'waf') && '-nap' || '' }}${{ contains(inputs.image, 'v5') && '-v5' || '' }}/nginx-plus-ingress
@@ -129,7 +129,7 @@ jobs:
129129
if: ${{ inputs.authenticated && ! inputs.full-build }}
130130

131131
- name: Setup QEMU
132-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
132+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
133133
with:
134134
platforms: arm64
135135
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3737

3838
- name: Setup QEMU
39-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
39+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
4040
with:
4141
platforms: arm64
4242

@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Docker meta
5454
id: meta
55-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
55+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
5656
with:
5757
images: |
5858
name=${{ env.IMAGE_NAME }},enable=true

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ jobs:
361361
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
362362

363363
- name: Setup QEMU
364-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
364+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
365365
with:
366366
platforms: arm64
367367
if: ${{ needs.checks.outputs.forked_workflow == 'false' || needs.checks.outputs.docs_only == 'false' }}

‎.github/workflows/image-promotion.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
fi
142142
143143
- name: Upload SARIF file
144-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
144+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
145145
if: steps.check-sarif.outputs.sarif_has_results == 'true'
146146
with:
147147
sarif_file: govulncheck.sarif
@@ -312,7 +312,7 @@ jobs:
312312
313313
- name: Docker meta
314314
id: meta
315-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
315+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
316316
with:
317317
context: workflow
318318
images: |
@@ -356,14 +356,14 @@ jobs:
356356
summary: true
357357

358358
- name: Upload Scan Results to Github Artifacts
359-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
359+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
360360
with:
361361
name: "${{ github.ref_name }}-${{ steps.directory.outputs.directory }}"
362362
path: "${{ steps.directory.outputs.directory }}/"
363363
overwrite: true
364364

365365
- name: Upload Scan results to GitHub Security tab
366-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
366+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
367367
with:
368368
sarif_file: "${{ steps.directory.outputs.directory }}/"
369369

@@ -392,7 +392,7 @@ jobs:
392392
393393
- name: Docker meta
394394
id: meta
395-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
395+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
396396
with:
397397
context: workflow
398398
images: |
@@ -436,14 +436,14 @@ jobs:
436436
summary: true
437437

438438
- name: Upload Scan Results to Github Artifacts
439-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
439+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
440440
with:
441441
name: "${{ github.ref_name }}-${{ steps.directory.outputs.directory }}"
442442
path: "${{ steps.directory.outputs.directory }}/"
443443
overwrite: true
444444

445445
- name: Upload Scan results to GitHub Security tab
446-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
446+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
447447
with:
448448
sarif_file: "${{ steps.directory.outputs.directory }}/"
449449

@@ -479,7 +479,7 @@ jobs:
479479
480480
- name: Docker meta
481481
id: meta
482-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
482+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
483483
with:
484484
context: workflow
485485
images: |
@@ -523,14 +523,14 @@ jobs:
523523
summary: true
524524

525525
- name: Upload Scan Results to Github Artifacts
526-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
526+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
527527
with:
528528
name: "${{ github.ref_name }}-${{ steps.directory.outputs.directory }}"
529529
path: "${{ steps.directory.outputs.directory }}/"
530530
overwrite: true
531531

532532
- name: Upload Scan results to GitHub Security tab
533-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
533+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
534534
with:
535535
sarif_file: "${{ steps.directory.outputs.directory }}/"
536536
continue-on-error: true
@@ -546,7 +546,7 @@ jobs:
546546
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
547547

548548
- name: Create/Update Draft
549-
uses: lucacome/draft-release@fd099feb33710d1fa27b915a08a7acd6a1fb7fd2 # v2.0.0
549+
uses: lucacome/draft-release@45e4395a3d8463abdb1747b20445b9be16ef6409 # v2.0.1
550550
id: release-notes
551551
with:
552552
minor-label: "enhancement"

‎.github/workflows/patch-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
5151

5252
- name: Setup QEMU
53-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
53+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
5454
with:
5555
platforms: arm64
5656

‎.github/workflows/regression.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ jobs:
294294
plus-jwt: ${{ secrets.PLUS_JWT }}
295295

296296
- name: Upload Test Results
297-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
297+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
298298
with:
299299
name: ${{ steps.regression-tests.outputs.test-results-name }}
300300
path: ${{ steps.regression-tests.outputs.test-results-path }}

‎.github/workflows/release.yml‎

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

481481
- name: Download Syft
482482
id: syft
483-
uses: anchore/sbom-action/download-syft@aa0e114b2e19480f157109b9922bda359bd98b90 # v0.20.8
483+
uses: anchore/sbom-action/download-syft@8e94d75ddd33f69f691467e42275782e4bfefe84 # v0.20.9
484484

485485
- name: Install Cosign
486486
uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0

0 commit comments

Comments
 (0)