Skip to content

Commit ec35983

Browse files
committed
Merge branch 'main' of https://github.com/envoyproxy/envoy into fix-windows-build
2 parents 7e8341b + 0074bd8 commit ec35983

452 files changed

Lines changed: 35720 additions & 6050 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/_check_coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
request: ${{ inputs.request }}
4747
runs-on: ${{ fromJSON(inputs.request).config.ci.agent-ubuntu }}
4848
steps-post: |
49-
- uses: envoyproxy/toolshed/gh-actions/gcs/artefact/sync@actions-v0.3.35
49+
- uses: envoyproxy/toolshed/actions/gcs/artefact/sync@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
5050
with:
5151
bucket: ${{ inputs.trusted && vars.GCS_ARTIFACT_BUCKET_POST || vars.GCS_ARTIFACT_BUCKET_PRE }}
5252
path: generated/${{ matrix.target }}/html

.github/workflows/_cve_fetch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-24.04
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
26+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2727
- name: Set vars
2828
id: vars
2929
run: |
@@ -35,7 +35,7 @@ jobs:
3535
else
3636
echo "weekly_run=false" >> $GITHUB_OUTPUT
3737
fi
38-
- uses: envoyproxy/toolshed/gh-actions/gcp/setup@actions-v0.3.35
38+
- uses: envoyproxy/toolshed/actions/gcp/setup@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
3939
name: Setup GCP
4040
with:
4141
key: ${{ secrets.gcs-cve-key }}

.github/workflows/_cve_scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
runs-on: ubuntu-24.04
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
26+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2727
- name: Set vars
2828
id: vars
2929
run: |
3030
echo "cve-data-path=${{ inputs.cve-data-path }}" > $GITHUB_OUTPUT
31-
- uses: envoyproxy/toolshed/gh-actions/gcp/setup@actions-v0.3.35
31+
- uses: envoyproxy/toolshed/actions/gcp/setup@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
3232
name: Setup GCP
3333
with:
3434
key: ${{ secrets.gcs-cve-key }}

.github/workflows/_finish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
actions: read
3737
contents: read
3838
steps:
39-
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.3.35
39+
- uses: envoyproxy/toolshed/actions/jq@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
4040
name: Incoming data
4141
id: needs
4242
with:
@@ -87,21 +87,21 @@ jobs:
8787
summary: "Check has finished",
8888
text: $text}}}}
8989
90-
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.3.35
90+
- uses: envoyproxy/toolshed/actions/jq@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
9191
name: Print summary
9292
with:
9393
input: ${{ toJSON(steps.needs.outputs.value).summary-title }}
9494
filter: |
9595
"## \(.)"
9696
options: -Rr
9797
output-path: GITHUB_STEP_SUMMARY
98-
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.3.35
98+
- uses: envoyproxy/toolshed/actions/appauth@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
9999
name: Appauth
100100
id: appauth
101101
with:
102102
app_id: ${{ secrets.app-id }}
103103
key: ${{ secrets.app-key }}
104-
- uses: envoyproxy/toolshed/gh-actions/github/checks@actions-v0.3.35
104+
- uses: envoyproxy/toolshed/actions/github/checks@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
105105
name: Update check
106106
with:
107107
action: update

.github/workflows/_load.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
# Handle any failure in triggering job
101101
# Remove any `checks` we dont care about
102102
# Prepare a check request
103-
- uses: envoyproxy/toolshed/gh-actions/github/env/load@actions-v0.3.35
103+
- uses: envoyproxy/toolshed/actions/github/env/load@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
104104
name: Load env
105105
id: data
106106
with:
@@ -111,21 +111,21 @@ jobs:
111111
GH_TOKEN: ${{ github.token }}
112112

113113
# Update the check
114-
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.3.35
114+
- uses: envoyproxy/toolshed/actions/appauth@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
115115
name: Appauth
116116
id: appauth
117117
with:
118118
app_id: ${{ secrets.app-id }}
119119
key: ${{ secrets.app-key }}
120-
- uses: envoyproxy/toolshed/gh-actions/github/checks@actions-v0.3.35
120+
- uses: envoyproxy/toolshed/actions/github/checks@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
121121
name: Update check
122122
if: ${{ fromJSON(steps.data.outputs.data).data.check.action == 'RUN' }}
123123
with:
124124
action: update
125125
checks: ${{ toJSON(fromJSON(steps.data.outputs.data).checks) }}
126126
token: ${{ steps.appauth.outputs.token }}
127127

128-
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.3.35
128+
- uses: envoyproxy/toolshed/actions/jq@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
129129
name: Print request summary
130130
with:
131131
input: |
@@ -145,7 +145,7 @@ jobs:
145145
| $summary.summary as $summary
146146
| "${{ inputs.template-request-summary }}"
147147
148-
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.3.35
148+
- uses: envoyproxy/toolshed/actions/jq@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
149149
id: request-output
150150
name: Load request
151151
with:

.github/workflows/_load_env.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ jobs:
6363
request: ${{ steps.env.outputs.data }}
6464
trusted: true
6565
steps:
66-
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.3.35
66+
- uses: envoyproxy/toolshed/actions/jq@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
6767
id: started
6868
name: Create timestamp
6969
with:
7070
options: -r
7171
filter: |
7272
now
73-
- uses: envoyproxy/toolshed/gh-actions/github/checkout@actions-v0.3.35
73+
- uses: envoyproxy/toolshed/actions/github/checkout@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
7474
id: checkout
7575
name: Checkout Envoy repository
7676
- name: Generate environment variables
77-
uses: envoyproxy/toolshed/gh-actions/envoy/ci/env@actions-v0.3.35
77+
uses: envoyproxy/toolshed/actions/envoy/ci/env@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
7878
id: env
7979
with:
8080
branch-name: ${{ inputs.branch-name }}
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Request summary
8888
id: summary
89-
uses: envoyproxy/toolshed/gh-actions/github/env/summary@actions-v0.3.35
89+
uses: envoyproxy/toolshed/actions/github/env/summary@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
9090
with:
9191
actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
9292
base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}

.github/workflows/_precheck_deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if: ${{ inputs.dependency-review }}
5353
steps:
5454
- name: Checkout Repository
55-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
55+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5656
with:
5757
ref: ${{ fromJSON(inputs.request).request.sha }}
5858
persist-credentials: false

.github/workflows/_precheck_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
--config=docs-ci
7474
rbe: true
7575
steps-post: |
76-
- uses: envoyproxy/toolshed/gh-actions/gcs/artefact/sync@actions-v0.3.35
76+
- uses: envoyproxy/toolshed/actions/gcs/artefact/sync@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
7777
with:
7878
bucket: ${{ inputs.trusted && vars.GCS_ARTIFACT_BUCKET_POST || vars.GCS_ARTIFACT_BUCKET_PRE }}
7979
path: generated/docs

.github/workflows/_publish_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ jobs:
139139
needs:
140140
- release
141141
steps:
142-
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.3.35
142+
- uses: envoyproxy/toolshed/actions/appauth@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
143143
id: appauth
144144
with:
145145
app_id: ${{ secrets.ENVOY_CI_SYNC_APP_ID }}
146146
key: ${{ secrets.ENVOY_CI_SYNC_APP_KEY }}
147-
- uses: envoyproxy/toolshed/gh-actions/dispatch@actions-v0.3.35
147+
- uses: envoyproxy/toolshed/actions/dispatch@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
148148
with:
149149
ref: main
150150
repository: ${{ fromJSON(inputs.request).request.version.dev && 'envoyproxy/envoy-website' || 'envoyproxy/archive' }}

.github/workflows/_publish_release_container.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Generate manifest configuration (dev)
5757
id: dev-config
5858
if: ${{ inputs.dev && inputs.target-branch == 'main' }}
59-
uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.3.35
59+
uses: envoyproxy/toolshed/actions/jq@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
6060
with:
6161
input-format: yaml
6262
filter: >-
@@ -135,7 +135,7 @@ jobs:
135135
- tools-dev-${{ github.sha }}
136136
137137
- name: Generate manifest configuration (release)
138-
uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.3.35
138+
uses: envoyproxy/toolshed/actions/jq@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
139139
id: release-config
140140
if: ${{ ! inputs.dev || ! inputs.target-branch != 'main' }}
141141
with:
@@ -216,7 +216,7 @@ jobs:
216216
- tools-v${{ inputs.version-major }}.${{ inputs.version-minor }}-latest
217217
218218
- name: Collect and push OCI artifacts
219-
uses: envoyproxy/toolshed/gh-actions/oci/collector@actions-v0.3.35
219+
uses: envoyproxy/toolshed/actions/oci/collector@35f9bcf37d0ceaedea0250da014348ce4bdf8d35 # v0.4.1
220220
with:
221221
artifacts-pattern: oci.*
222222
manifest-config: ${{ steps.dev-config.outputs.value || steps.release-config.outputs.value }}

0 commit comments

Comments
 (0)