Skip to content

Commit 9b348cf

Browse files
chore: merge upstream main, keep both new tests in filter_test.cc
Resolved conflict between local ModeOverrideBufferedToFullDuplexChunkedEmptyBody test and upstream HttpEventTrafficStatsTest, both added at the end of the file. Kept both tests.
2 parents 9285bdb + 923e61a commit 9b348cf

1,190 files changed

Lines changed: 91739 additions & 23349 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.

.bazelci/presubmit.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ tasks:
1717
platform: ubuntu2004
1818
shell_commands:
1919
- "sudo apt -y update && sudo apt -y install automake autotools-dev cmake libtool m4 ninja-build"
20-
- "wget https://apt.llvm.org/llvm.sh && sudo bash llvm.sh 14"
21-
- "bazel/setup_clang.sh /usr/lib/llvm-14"
22-
# TODO(keith): Remove once we use clang 15+ on CI
23-
- "sudo apt-get install -y libclang-rt-14-dev"
2420
test_targets:
2521
- "//test/common/common/..."
2622
- "//test/integration/..."

.bazelrc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ build:compile-time-options --config=boringssl-fips
208208
build:compile-time-options --define=log_debug_assert_in_release=enabled
209209
build:compile-time-options --define=path_normalization_by_default=true
210210
build:compile-time-options --define=deprecated_features=disabled
211-
build:compile-time-options --define=tcmalloc=gperftools
212211
build:compile-time-options --define=uhv=enabled
213212
# gRPC has a lot of deprecated-enum-enum-conversion warnings with C++20
214213
build:compile-time-options --copt=-Wno-error=deprecated-enum-enum-conversion
@@ -223,18 +222,18 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
223222

224223
common:fips-common --test_tag_filters=-nofips
225224
common:fips-common --build_tag_filters=-nofips
226-
common:fips-common --//bazel:fips=True
225+
common:fips-common --@envoy//bazel:fips=True
227226

228227
# BoringSSL FIPS
229228
common:boringssl-fips --config=fips-common
230-
common:boringssl-fips --//bazel:ssl=@boringssl_fips//:ssl
231-
common:boringssl-fips --//bazel:crypto=@boringssl_fips//:crypto
229+
common:boringssl-fips --@envoy//bazel:ssl=@boringssl_fips//:ssl
230+
common:boringssl-fips --@envoy//bazel:crypto=@boringssl_fips//:crypto
232231

233232
# AWS-LC FIPS
234233
common:aws-lc-fips --config=fips-common
235-
common:aws-lc-fips --//bazel:ssl=@aws_lc//:ssl
236-
common:aws-lc-fips --//bazel:crypto=@aws_lc//:crypto
237-
common:aws-lc-fips --//bazel:http3=False
234+
common:aws-lc-fips --@envoy//bazel:ssl=@aws_lc//:ssl
235+
common:aws-lc-fips --@envoy//bazel:crypto=@aws_lc//:crypto
236+
common:aws-lc-fips --@envoy//bazel:http3=False
238237

239238

240239
#############################################################################
@@ -266,7 +265,7 @@ build:asan-common --build_tag_filters=-no_san
266265
build:asan-common --test_tag_filters=-no_san
267266
build:asan-common --copt -fsanitize=address,undefined
268267
build:asan-common --linkopt -fsanitize=address,undefined
269-
# vptr and function sanitizer are enabled in asan if it is set up via bazel/setup_clang.sh.
268+
# vptr and function sanitizer are enabled in asan when using --config=clang.
270269
build:asan-common --copt -fno-sanitize=vptr,function
271270
build:asan-common --linkopt -fno-sanitize=vptr,function
272271
build:asan-common --copt -DADDRESS_SANITIZER=1

.gemini/config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
code_review:
2+
disable: false
3+
pull_request_opened:
4+
help: false
5+
summary: false
6+
code_review: false
7+
include_drafts: false

.github/config.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ checks:
9494
required: true
9595
on-run:
9696
- mobile-perf
97+
mobile-python:
98+
name: Mobile/Python
99+
required: true
100+
on-run:
101+
- mobile-python
97102
mobile-release-validation:
98103
name: Mobile/Release validation
99104
required: true
@@ -320,6 +325,18 @@ run:
320325
- mobile/.bazelrc
321326
- mobile/**/*
322327
- tools/code_format/check_format.py
328+
mobile-python:
329+
paths:
330+
- .bazelrc
331+
- .bazelversion
332+
- .github/config.yml
333+
- .github/workflows/mobile-python.yml
334+
- bazel/external/quiche.BUILD
335+
- bazel/repositories.bzl
336+
- bazel/repository_locations.bzl
337+
- mobile/.bazelrc
338+
- mobile/**/*
339+
- tools/code_format/check_format.py
323340
mobile-release-validation:
324341
paths:
325342
- .bazelrc

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ updates:
2323
interval: "daily"
2424
time: "06:00"
2525

26+
- package-ecosystem: "pip"
27+
directory: "/mobile/third_party/python"
28+
open-pull-requests-limit: 20
29+
schedule:
30+
interval: "daily"
31+
time: "06:00"
32+
2633
- package-ecosystem: "docker"
2734
directory: "/.devcontainer"
2835
schedule:

.github/workflows/_precheck_deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ jobs:
5757
ref: ${{ fromJSON(inputs.request).request.sha }}
5858
persist-credentials: false
5959
- name: Dependency Review
60-
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
60+
uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0

.github/workflows/_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,14 @@ jobs:
176176
# TODO(phlax): shift this to ci/request action above
177177
- name: Check Docker cache (x64)
178178
id: cache-exists-docker-x64
179-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
179+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
180180
with:
181181
lookup-only: true
182182
path: /tmp/cache
183183
key: ${{ fromJSON(steps.data.outputs.value).request.build-image.default }}
184184
- name: Check Docker cache (arm64)
185185
id: cache-exists-docker-arm64
186-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
186+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
187187
with:
188188
lookup-only: true
189189
path: /tmp/cache

.github/workflows/_run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ jobs:
318318
# HACK/WORKAROUND for cache scope issue (https://github.com/envoyproxy/envoy/issues/37603)
319319
- if: ${{ inputs.cache-build-image }}
320320
id: cache-lookup
321-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
321+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
322322
with:
323323
lookup-only: true
324324
path: /tmp/cache

.github/workflows/_upload_gcs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
matrix:
2626
artifact: ${{ fromJSON(inputs.artifacts) }}
2727
steps:
28-
- uses: actions/download-artifact@v4.1.3
28+
- uses: actions/download-artifact@v8.0.0
2929
with:
3030
name: ${{ matrix.artifact }}
3131
path: ${{ matrix.artifact }}

.github/workflows/codeql-daily.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5353

5454
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # codeql-bundle-v4.32.0
55+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # codeql-bundle-v4.35.1
5656
with:
5757
languages: cpp
5858
trap-caching: false
@@ -91,4 +91,4 @@ jobs:
9191
git clean -xdf
9292
9393
- name: Perform CodeQL Analysis
94-
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # codeql-bundle-v4.32.0
94+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # codeql-bundle-v4.35.1

0 commit comments

Comments
 (0)