Skip to content

Commit

Permalink
Merge branch 'main' into fix-ecds-configdump
Browse files Browse the repository at this point in the history
Signed-off-by: zengyuxing007 <[email protected]>
  • Loading branch information
zengyuxing007 authored Mar 22, 2024
2 parents acf36e3 + 325704c commit 4c2a488
Show file tree
Hide file tree
Showing 642 changed files with 13,208 additions and 5,775 deletions.
34 changes: 15 additions & 19 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,27 +150,8 @@ checks:
- publish
- verify
required: true
windows:
name: Envoy/Windows
required: true
on-run:
- build-windows

run:
build-windows:
paths:
- .bazelrc
- .bazelversion
- .github/config.yml
- api/**/*
- bazel/**/*
- ci/**/*
- configs/**/*
- contrib/**/*
- envoy/**/*
- source/**/*
- test/**/*
- VERSION.txt
build-macos:
paths:
- .bazelrc
Expand All @@ -191,6 +172,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-android-all:
Expand All @@ -200,6 +182,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
push: never
Expand All @@ -210,6 +193,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-asan:
Expand All @@ -219,6 +203,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-cc:
Expand All @@ -228,6 +213,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-compile-time-cc:
Expand All @@ -240,6 +226,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-coverage:
Expand All @@ -249,19 +236,22 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-core:
paths:
- "**/*"
- "*"
- mobile/.bazelrc
mobile-format:
paths:
- .bazelrc
- .bazelversion
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-ios:
Expand All @@ -271,6 +261,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-ios-all:
Expand All @@ -280,6 +271,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
push: never
Expand All @@ -290,6 +282,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-perf:
Expand All @@ -299,6 +292,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-release-validation:
Expand All @@ -308,6 +302,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
mobile-tsan:
Expand All @@ -317,6 +312,7 @@ run:
- .github/config.yml
- bazel/external/quiche.BUILD
- bazel/repository_locations.bzl
- mobile/.bazelrc
- mobile/**/*
- tools/code_format/check_format.py
precheck-deps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
# For a job that does, you can restore with something like:
#
# steps:
# - uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].27
# - uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].29
# with:
# key: "${{ needs.env.outputs.build-image }}"
#
Expand All @@ -39,28 +39,28 @@ jobs:
docker:
runs-on: ubuntu-22.04
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
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].27
- uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].29
id: docker
name: Prime Docker cache (${{ inputs.image-tag }})
with:
image-tag: ${{ inputs.image-tag }}
lock-token: ${{ steps.appauth.outputs.token }}
lock-repository: ${{ inputs.lock-repository }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
id: data
name: Cache data
with:
input-format: yaml
input: |
cached: ${{ steps.docker.outputs.cached }}
key: ${{ inputs.image-tag }}
- uses: envoyproxy/toolshed/gh-actions/json/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/json/[email protected].29
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].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
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].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
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].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].29
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 @@ -91,7 +91,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].27
- uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].29
name: Load env
id: data
with:
Expand All @@ -102,21 +102,21 @@ jobs:
GH_TOKEN: ${{ github.token }}

# Update the check
- uses: envoyproxy/toolshed/gh-actions/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].29
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].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
name: Print request summary
with:
input: |
Expand All @@ -136,7 +136,7 @@ jobs:
| $summary.summary as $summary
| "${{ inputs.template-request-summary }}"
- uses: envoyproxy/toolshed/gh-actions/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
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].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].29
id: checkout
name: Checkout Envoy repository
- name: Generate environment variables
uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].27
uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].29
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].27
uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].29
with:
actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/_mobile_container_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ jobs:
steps-pre: ${{ inputs.steps-pre }}
steps-post: ${{ inputs.steps-post }}
target: ${{ inputs.target }}
timeout-minutes: ${{ inputs.timeout-minutes }}
trusted: ${{ fromJSON(inputs.request).request.trusted }}
upload-name: ${{ inputs.upload-name }}
upload-path: ${{ inputs.upload-path }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/_precheck_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ jobs:
if: ${{ inputs.dependency-review }}
steps:
- name: Checkout Repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
with:
ref: ${{ fromJSON(inputs.request).request.sha }}
persist-credentials: false
- name: Dependency Review
uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3
uses: actions/dependency-review-action@0fa40c3c10055986a88de3baa0d6ec17c5a894b3 # v4.2.3
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].27
- uses: envoyproxy/toolshed/gh-actions/[email protected].29
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].27
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].29
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].27
uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].29
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].27
uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].29
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].27
uses: envoyproxy/toolshed/gh-actions/[email protected].29
id: data
with:
input: |
Expand Down
Loading

0 comments on commit 4c2a488

Please sign in to comment.