Skip to content

Commit cf9d25b

Browse files
salonichf5salonichf5
authored
Merge branch 'main' into bug/ipv6-nplus
2 parents 1dfcc5f + 6295850 commit cf9d25b

14 files changed

+579
-81
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Authenticate to Google Cloud
8484
id: auth
85-
uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3
85+
uses: google-github-actions/auth@f112390a2df9932162083945e46d439060d66ec2 # v2.1.4
8686
with:
8787
token_format: access_token
8888
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
@@ -131,7 +131,7 @@ jobs:
131131
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
132132

133133
- name: Build Docker Image
134-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
134+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
135135
with:
136136
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }}
137137
context: "."
@@ -178,7 +178,7 @@ jobs:
178178
if: always()
179179

180180
- name: Upload Scan Results
181-
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
181+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
182182
continue-on-error: true
183183
with:
184184
name: scan-results-${{ inputs.image }}

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
token: ${{ secrets.CODECOV_TOKEN }}
9898

9999
- name: Upload Coverage Report
100-
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
100+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
101101
with:
102102
name: cover-${{ github.run_id }}.html
103103
path: ${{ github.workspace }}/cover.html

‎.github/workflows/conformance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
TELEMETRY_ENDPOINT_INSECURE: "false"
8989

9090
- name: Build NGF Docker Image
91-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
91+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
9292
with:
9393
file: build/Dockerfile
9494
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -99,7 +99,7 @@ jobs:
9999
pull: true
100100

101101
- name: Build NGINX Docker Image
102-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
102+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
103103
with:
104104
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
105105
tags: ${{ steps.nginx-meta.outputs.tags }}
@@ -118,7 +118,7 @@ jobs:
118118
working-directory: ./tests
119119

120120
- name: Build Test Docker Image
121-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
121+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
122122
with:
123123
file: tests/conformance/Dockerfile
124124
tags: conformance-test-runner:${{ github.sha }}

‎.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2323

2424
- name: Scan
25-
uses: fossas/fossa-action@47ef11b1e1e3812e88dae436ccbd2d0cbd1adab0 # v1.3.3
25+
uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0
2626
with:
2727
api-key: ${{ secrets.FOSSA_TOKEN }}

‎.github/workflows/functional.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
TELEMETRY_ENDPOINT_INSECURE: "true"
7777

7878
- name: Build NGF Docker Image
79-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
79+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
8080
with:
8181
file: build/Dockerfile
8282
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -87,7 +87,7 @@ jobs:
8787
target: goreleaser
8888

8989
- name: Build NGINX Docker Image
90-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
90+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
9191
with:
9292
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
9393
tags: ${{ steps.nginx-meta.outputs.tags }}

‎.github/workflows/helm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
6161
6262
- name: Build NGF Docker Image
63-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
63+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
6464
with:
6565
file: build/Dockerfile
6666
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -71,7 +71,7 @@ jobs:
7171
pull: true
7272

7373
- name: Build NGINX Docker Image
74-
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
74+
uses: docker/build-push-action@4f7cdeb0f05278b464e71357394bf2c61f94138e # v6.6.0
7575
with:
7676
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
7777
tags: ${{ steps.nginx-meta.outputs.tags }}

‎.github/workflows/nfr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ jobs:
7575

7676
- name: Authenticate to Google Cloud
7777
id: auth
78-
uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3
78+
uses: google-github-actions/auth@f112390a2df9932162083945e46d439060d66ec2 # v2.1.4
7979
with:
8080
token_format: access_token
8181
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
8282
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
8383

8484
- name: Set up Cloud SDK
85-
uses: google-github-actions/setup-gcloud@98ddc00a17442e89a24bbf282954a3b65ce6d200 # v2.1.0
85+
uses: google-github-actions/setup-gcloud@f0990588f1e5b5af6827153b93673613abdc6ec7 # v2.1.1
8686
with:
8787
project_id: ${{ secrets.GCP_PROJECT_ID }}
8888
install_components: kubectl
@@ -129,7 +129,7 @@ jobs:
129129
fi
130130
131131
- name: Upload Artifacts
132-
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
132+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
133133
with:
134134
name: results-${{ matrix.type }}
135135
path: tests/results/**/*-${{ matrix.type }}.*

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5353
# format to the repository Actions tab.
5454
- name: "Upload artifact"
55-
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
55+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
5656
with:
5757
name: SARIF file
5858
path: results.sarif

0 commit comments

Comments
 (0)