Skip to content

Commit

Permalink
Merge pull request #272 from envoyproxy/auto-merge-main
Browse files Browse the repository at this point in the history
auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main]
  • Loading branch information
tedjpoole authored Oct 18, 2024
2 parents 9d96077 + 3cfc947 commit 359eb83
Show file tree
Hide file tree
Showing 190 changed files with 3,354 additions and 2,486 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,29 @@ jobs:
docker:
runs-on: ${{ inputs.runs-on || 'ubuntu-24.04' }}
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: appauth
name: Appauth (mutex lock)
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].37
id: docker
name: Prime Docker cache (${{ inputs.image-tag }}${{ inputs.cache-suffix }})
with:
image-tag: ${{ inputs.image-tag }}
key-suffix: ${{ inputs.cache-suffix }}
lock-token: ${{ steps.appauth.outputs.token }}
lock-repository: ${{ inputs.lock-repository }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: data
name: Cache data
with:
input-format: yaml
input: |
cached: ${{ steps.docker.outputs.cached }}
key: ${{ inputs.image-tag }}${{ inputs.cache-suffix }}
- uses: envoyproxy/toolshed/gh-actions/json/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/json/[email protected].37
name: Summary
with:
json: ${{ steps.data.outputs.value }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_finish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
actions: read
contents: read
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
name: Incoming data
id: needs
with:
Expand Down Expand Up @@ -87,21 +87,21 @@ jobs:
summary: "Check has finished",
text: $text}}}}
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
name: Print summary
with:
input: ${{ toJSON(steps.needs.outputs.value).summary-title }}
filter: |
"## \(.)"
options: -Rr
output-path: GITHUB_STEP_SUMMARY
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
name: Update check
with:
action: update
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/_load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
# Handle any failure in triggering job
# Remove any `checks` we dont care about
# Prepare a check request
- uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].37
name: Load env
id: data
with:
Expand All @@ -118,21 +118,21 @@ jobs:
GH_TOKEN: ${{ github.token }}

# Update the check
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
name: Update check
if: ${{ fromJSON(steps.data.outputs.data).data.check.action == 'RUN' }}
with:
action: update
checks: ${{ toJSON(fromJSON(steps.data.outputs.data).checks) }}
token: ${{ steps.appauth.outputs.token }}

- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
name: Print request summary
with:
input: |
Expand All @@ -152,7 +152,7 @@ jobs:
| $summary.summary as $summary
| "${{ inputs.template-request-summary }}"
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: request-output
name: Load request
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_load_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ jobs:
request: ${{ steps.env.outputs.data }}
trusted: true
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
id: checkout
name: Checkout Envoy repository
- name: Generate environment variables
uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].36
uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].37
id: env
with:
branch-name: ${{ inputs.branch-name }}
Expand All @@ -86,7 +86,7 @@ jobs:

- name: Request summary
id: summary
uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].36
uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].37
with:
actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/_publish_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ jobs:
needs:
- publish
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: appauth
with:
app_id: ${{ secrets.ENVOY_CI_SYNC_APP_ID }}
key: ${{ secrets.ENVOY_CI_SYNC_APP_KEY }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
with:
ref: main
repository: ${{ fromJSON(inputs.request).request.version.dev && 'envoyproxy/envoy-website' || 'envoyproxy/archive' }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
env: ${{ steps.data.outputs.value }}
config: ${{ steps.config.outputs.config }}
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
id: checkout
name: Checkout Envoy repository
with:
Expand All @@ -60,7 +60,7 @@ jobs:
# *ALL* variables collected should be treated as untrusted and should be sanitized before
# use
- name: Generate environment variables from commit
uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].36
uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].37
id: env
with:
branch-name: ${{ steps.checkout.outputs.branch-name }}
Expand All @@ -71,7 +71,7 @@ jobs:
vars: ${{ toJSON(vars) }}
- name: Request summary
id: summary
uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].36
uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].37
with:
actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}
Expand All @@ -87,7 +87,7 @@ jobs:
target-branch: ${{ fromJSON(steps.env.outputs.data).request.target-branch }}

- name: Environment data
uses: envoyproxy/toolshed/gh-actions/[email protected].36
uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: data
with:
input: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,15 @@ jobs:
name: ${{ inputs.target-suffix && format('[{0}] ', inputs.target-suffix) || '' }}${{ inputs.command }} ${{ inputs.target }}
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: started
name: Create timestamp
with:
options: -r
filter: |
now
# This controls which input vars are exposed to the run action (and related steps)
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
name: Context
id: context
with:
Expand All @@ -208,12 +208,12 @@ jobs:
| . * {$config, $check}
- if: ${{ inputs.cache-build-image }}
name: Restore Docker cache ${{ inputs.cache-build-image && format('({0})', inputs.cache-build-image) || '' }}
uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].36
uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].37
with:
image_tag: ${{ inputs.cache-build-image }}
key-suffix: ${{ inputs.cache-build-image-key-suffix }}

- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: appauth
name: Appauth
if: ${{ inputs.trusted }}
Expand All @@ -224,7 +224,7 @@ jobs:
# - the workaround is to allow the token to be passed through.
token: ${{ github.token }}
token-ok: true
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
id: checkout
name: Checkout Envoy repository
with:
Expand All @@ -241,7 +241,7 @@ jobs:
token: ${{ inputs.trusted && steps.appauth.outputs.token || github.token }}

# This is currently only use by mobile-docs and can be removed once they are updated to the newer website
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
id: checkout-extra
name: Checkout extra repository (for publishing)
if: ${{ inputs.checkout-extra }}
Expand All @@ -250,7 +250,7 @@ jobs:
ssh-key: ${{ inputs.trusted && inputs.ssh-key-extra || '' }}

- name: Import GPG key
uses: envoyproxy/toolshed/gh-actions/gpg/[email protected].36
uses: envoyproxy/toolshed/gh-actions/gpg/[email protected].37
if: ${{ inputs.import-gpg }}
with:
key: ${{ secrets.gpg-key }}
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:
BAZEL_BUILD_EXTRA_OPTIONS="--google_credentials=/build/${GCP_SERVICE_ACCOUNT_KEY_FILE} --config=remote-ci --config=rbe-google"
echo "BAZEL_BUILD_EXTRA_OPTIONS=${BAZEL_BUILD_EXTRA_OPTIONS}" >> "$GITHUB_ENV"
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
name: Run CI ${{ inputs.command }} ${{ inputs.target }}
with:
args: ${{ inputs.args != '--' && inputs.args || inputs.target }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/_start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
start:
runs-on: ubuntu-22.04
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
id: check-config
name: Prepare check data
with:
Expand All @@ -77,13 +77,13 @@ jobs:
| .skipped.output.summary = "${{ inputs.skipped-summary }}"
| .skipped.output.text = ""
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
name: Start checks
id: checks
with:
Expand All @@ -94,7 +94,7 @@ jobs:
${{ fromJSON(inputs.env).summary.summary }}
token: ${{ steps.appauth.outputs.token }}
- uses: envoyproxy/toolshed/gh-actions/json/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/json/[email protected].37
name: Summary
with:
collapse-open: true
Expand All @@ -118,7 +118,7 @@ jobs:
output-path: GITHUB_STEP_SUMMARY
title: Checks started/skipped

- uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].37
name: Save env
id: data
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Free disk space
uses: envoyproxy/toolshed/gh-actions/[email protected].36
uses: envoyproxy/toolshed/gh-actions/[email protected].37

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # codeql-bundle-v3.26.12
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # codeql-bundle-v3.26.13
# Override language selection by uncommenting this and choosing your languages
with:
languages: cpp
Expand Down Expand Up @@ -74,4 +74,4 @@ jobs:
git clean -xdf
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # codeql-bundle-v3.26.12
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # codeql-bundle-v3.26.13
6 changes: 3 additions & 3 deletions .github/workflows/codeql-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ jobs:

- name: Free disk space
if: ${{ env.BUILD_TARGETS != '' }}
uses: envoyproxy/toolshed/gh-actions/[email protected].36
uses: envoyproxy/toolshed/gh-actions/[email protected].37

- name: Initialize CodeQL
if: ${{ env.BUILD_TARGETS != '' }}
uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # codeql-bundle-v3.26.12
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # codeql-bundle-v3.26.13
with:
languages: cpp

Expand Down Expand Up @@ -109,4 +109,4 @@ jobs:
- name: Perform CodeQL Analysis
if: ${{ env.BUILD_TARGETS != '' }}
uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # codeql-bundle-v3.26.12
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # codeql-bundle-v3.26.13
6 changes: 3 additions & 3 deletions .github/workflows/command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
&& github.actor != 'dependabot[bot]'
}}
steps:
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].37
name: Parse command from comment
id: command
with:
Expand All @@ -37,14 +37,14 @@ jobs:
^/(retest)
# /retest
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
if: ${{ steps.command.outputs.command == 'retest' }}
id: appauth-retest
name: Appauth (retest)
with:
key: ${{ secrets.ENVOY_CI_APP_KEY }}
app_id: ${{ secrets.ENVOY_CI_APP_ID }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].36
- uses: envoyproxy/toolshed/gh-actions/[email protected].37
if: ${{ steps.command.outputs.command == 'retest' }}
name: Retest
with:
Expand Down
Loading

0 comments on commit 359eb83

Please sign in to comment.