Skip to content

Commit

Permalink
Update Envoy to 068adb1 (Jun 5th 2023) (#996)
Browse files Browse the repository at this point in the history
- `.bazelrc` unchanged
- Updated `ci/run_envoy_docker.sh`
- `tools/gen_compilation_database.py` unchanged
- Updated `tools/code_format/config.yaml`
- `ci/do_ci.sh fix_format` reordered lines in `source/client/BUILD`

Signed-off-by: eric846 <[email protected]>
  • Loading branch information
eric846 authored Jun 6, 2023
1 parent 6439f7b commit 7c354d7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "cab680b0ef801e269f9a50cd745728d4ae8b86e6"
ENVOY_SHA = "75f9b5e7ce4a764c5579c7b3261e610eb0b4feb8c4239a14f7c1d0fcb757c33a"
ENVOY_COMMIT = "068adb188b025c48442d440d7942828e258ed467"
ENVOY_SHA = "2b390f96e31b446a9f01ce4bd1bd362cc0f6cf37541d7c4b0636a0168d372851"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
1 change: 1 addition & 0 deletions ci/run_envoy_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ docker run --rm \
-e ENVOY_BUILD_FILTER_EXAMPLE \
-e ENVOY_COMMIT \
-e ENVOY_HEAD_REF \
-e ENVOY_PUBLISH_DRY_RUN \
-e ENVOY_REPO \
-e SYSTEM_PULLREQUEST_PULLREQUESTNUMBER \
-e GCS_ARTIFACT_BUCKET \
Expand Down
14 changes: 7 additions & 7 deletions source/client/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,19 @@ envoy_cc_library(
"//include/nighthawk/client:client_includes",
"//include/nighthawk/common:base_includes",
"//include/nighthawk/user_defined_output:user_defined_output_plugin",
"//source/common:request_source_impl_lib",
"//source/common:nighthawk_common_lib",
"//source/common:nighthawk_service_client_impl",
"//source/common:request_source_impl_lib",
"//source/request_source:request_options_list_plugin_impl",
"//source/user_defined_output:user_defined_output_plugin_creator",
"@envoy//source/common/common:random_generator_lib_with_external_headers",
"@envoy//envoy/http:protocol_interface_with_external_headers",
"@envoy//envoy/network:address_interface",
"@envoy//envoy/server:instance_interface",
"@envoy//source/common/access_log:access_log_manager_lib_with_external_headers",
"@envoy//source/common/api:api_lib_with_external_headers",
"@envoy//source/common/common:cleanup_lib_with_external_headers",
"@envoy//source/common/common:random_generator_lib_with_external_headers",
"@envoy//source/common/common:statusor_lib_with_external_headers",
"@envoy//source/common/config:utility_lib_with_external_headers",
"@envoy//source/common/event:dispatcher_includes_with_external_headers",
"@envoy//source/common/event:real_time_system_lib_with_external_headers",
Expand All @@ -115,6 +119,7 @@ envoy_cc_library(
"@envoy//source/common/network:address_lib_with_external_headers",
"@envoy//source/common/protobuf:message_validator_lib_with_external_headers",
"@envoy//source/common/protobuf:utility_lib_with_external_headers",
"@envoy//source/common/router:context_lib_with_external_headers",
"@envoy//source/common/runtime:runtime_lib_with_external_headers",
"@envoy//source/common/secret:secret_manager_impl_lib_with_external_headers",
"@envoy//source/common/singleton:manager_impl_lib_with_external_headers",
Expand All @@ -133,11 +138,6 @@ envoy_cc_library(
"@envoy//source/extensions/transport_sockets/tls:context_lib_with_external_headers",
"@envoy//source/server:server_lib_with_external_headers",
"@envoy//source/server/config_validation:admin_lib_with_external_headers",
"@envoy//envoy/http:protocol_interface_with_external_headers",
"@envoy//envoy/network:address_interface",
"@envoy//envoy/server:instance_interface",
"@envoy//source/common/common:statusor_lib_with_external_headers",
"@envoy//source/common/router:context_lib_with_external_headers",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
] + select({
"//bazel:zipkin_disabled": [],
Expand Down
1 change: 1 addition & 0 deletions tools/code_format/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ paths:
- source/server/config_validation/server.cc
- source/server/admin/html/active_stats.js
- source/server/server.cc
- source/server/utils.cc
- source/server/configuration_impl.h
- source/server/hot_restarting_base.cc
- source/server/hot_restart_impl.cc
Expand Down

0 comments on commit 7c354d7

Please sign in to comment.