Skip to content

Commit eb67512

Browse files
sjbermansjberman
authored
Merge branch 'main' into chore/remove-tools
2 parents e3cd6f4 + e5faeee commit eb67512

File tree

9 files changed

+76
-76
lines changed

9 files changed

+76
-76
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ jobs:
4646
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
4747

4848
- name: Docker Buildx
49-
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
49+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
5050
with:
5151
driver-opts: network=host
5252

5353
- name: Setup QEMU
54-
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
54+
uses: docker/setup-qemu-action@5964de0df58d5ad28b04d8fe2e6b80ad47105b91 # v3.5.0
5555
with:
5656
platforms: arm64
5757

@@ -99,7 +99,7 @@ jobs:
9999

100100
- name: Docker meta
101101
id: meta
102-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
102+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
103103
with:
104104
context: ${{ inputs.tag != '' && 'git' || 'workflow' }}
105105
images: |
@@ -132,7 +132,7 @@ jobs:
132132
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
133133

134134
- name: Build Docker Image
135-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
135+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
136136
with:
137137
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }}
138138
context: "."

‎.github/workflows/conformance.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
4949

5050
- name: Docker Buildx
51-
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
51+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
5252

5353
- name: NGF Docker meta
5454
id: ngf-meta
55-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
55+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
5656
with:
5757
images: |
5858
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -65,7 +65,7 @@ jobs:
6565
6666
- name: NGINX Docker meta
6767
id: nginx-meta
68-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
68+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
6969
with:
7070
images: |
7171
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
@@ -93,7 +93,7 @@ jobs:
9393
TELEMETRY_ENDPOINT_INSECURE: "false"
9494

9595
- name: Build NGF Docker Image
96-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
96+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
9797
with:
9898
file: build/Dockerfile
9999
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -104,7 +104,7 @@ jobs:
104104
pull: true
105105

106106
- name: Build NGINX Docker Image
107-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
107+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
108108
with:
109109
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
110110
tags: ${{ steps.nginx-meta.outputs.tags }}
@@ -123,7 +123,7 @@ jobs:
123123
working-directory: ./tests
124124

125125
- name: Build Test Docker Image
126-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
126+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
127127
with:
128128
file: tests/conformance/Dockerfile
129129
tags: conformance-test-runner:${{ github.sha }}

‎.github/workflows/functional.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242
run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
4343

4444
- name: Docker Buildx
45-
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
45+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
4646

4747
- name: NGF Docker meta
4848
id: ngf-meta
49-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
49+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
5050
with:
5151
images: |
5252
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -59,7 +59,7 @@ jobs:
5959
6060
- name: NGINX Docker meta
6161
id: nginx-meta
62-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
62+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
6363
with:
6464
images: |
6565
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
@@ -80,7 +80,7 @@ jobs:
8080
TELEMETRY_ENDPOINT_INSECURE: "true"
8181

8282
- name: Build NGF Docker Image
83-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
83+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
8484
with:
8585
file: build/Dockerfile
8686
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -91,7 +91,7 @@ jobs:
9191
target: goreleaser
9292

9393
- name: Build NGINX Docker Image
94-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
94+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
9595
with:
9696
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
9797
tags: ${{ steps.nginx-meta.outputs.tags }}

‎.github/workflows/helm.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
3232

3333
- name: Docker Buildx
34-
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
34+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
3535

3636
- name: NGF Docker meta
3737
id: ngf-meta
38-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
38+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
3939
with:
4040
images: |
4141
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -48,7 +48,7 @@ jobs:
4848
4949
- name: NGINX Docker meta
5050
id: nginx-meta
51-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
51+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
5252
with:
5353
images: |
5454
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
@@ -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@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
63+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.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@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
74+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ jobs:
172172
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
173173

174174
- name: Download Artifacts
175-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
175+
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
176176
with:
177177
path: tests/results/
178178
merge-multiple: true
179179

180180
- name: Open a PR with the results
181-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
181+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
182182
with:
183183
token: ${{ secrets.NGINX_PAT }}
184184
commit-message: NFR Test Results for NGF version ${{ needs.vars.outputs.version }}

‎.github/workflows/release-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
make generate-all
8282
8383
- name: Create Pull Request
84-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
84+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
8585
with:
8686
token: ${{ secrets.NGINX_PAT }}
8787
commit-message: Release ${{ inputs.version }}

0 commit comments

Comments
 (0)