Skip to content

Limit proxy BEP named set events #3333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
karim-alweheshy wants to merge 1 commit into
base: build-proxy-reddit-consumer-integration
Choose a base branch
from
Draft

Limit proxy BEP named set events #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions test/internal/build_proxy_launcher/build_proxy_launcher_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ readonly proxy_bep_block
expected_bep_flag="--build_event_json_file=\$SWIFTBUILD_BAZEL_PROXY_BEP_PATH"
readonly expected_bep_flag
[[ "$(grep -Fc -- "$expected_bep_flag" <<< "$proxy_bep_block")" == 1 ]]
[[ "$(grep -Fc -- '--build_event_max_named_set_of_file_entries=256' <<< "$proxy_bep_block")" == 1 ]]

proxy_execution_log_flags_block="$(sed -n '/# The build service gives every operation/,/^fi$/p' "$adapter_source")"
readonly proxy_execution_log_flags_block
Expand Down Expand Up @@ -108,6 +109,8 @@ readonly proxy_receipt_command_options_block
[[ "$(grep -Fc -- '"$option" != --execution_log_binary_file=*' <<< "$proxy_receipt_command_options_block")" == 1 ]]
# shellcheck disable=SC2016
[[ "$(grep -Fc -- '"$option" != --noexecution_log_sort' <<< "$proxy_receipt_command_options_block")" == 1 ]]
# shellcheck disable=SC2016
[[ "$(grep -Fc -- '"$option" != --build_event_max_named_set_of_file_entries=*' <<< "$proxy_receipt_command_options_block")" == 1 ]]
# The extracted source fragment consumes this array through `eval` below.
# shellcheck disable=SC2034
base_pre_config_flags=(--base-build-flag)
Expand All @@ -116,6 +119,7 @@ build_pre_config_flags=(
"--execution_log_json_file=$expected_execution_log_path"
"--execution_log_binary_file=$expected_execution_log_path"
--noexecution_log_sort
--build_event_max_named_set_of_file_entries=256
--kept-build-flag
)
receipt_args=()
Expand Down Expand Up @@ -200,6 +204,8 @@ done
# shellcheck disable=SC2016
[[ "$(grep -Fc -- '"$option" != --build_event_json_file=*' <<< "$proxy_action_graph_block")" == 1 ]]
# shellcheck disable=SC2016
[[ "$(grep -Fc -- '"$option" != --build_event_max_named_set_of_file_entries=*' <<< "$proxy_action_graph_block")" == 1 ]]
# shellcheck disable=SC2016
[[ "$(grep -Fc -- '"$option" != --execution_log_compact_file=*' <<< "$proxy_action_graph_block")" == 1 ]]
# shellcheck disable=SC2016
[[ "$(grep -Fc -- '"$option" != --execution_log_json_file=*' <<< "$proxy_action_graph_block")" == 1 ]]
Expand Down
1 change: 1 addition & 0 deletions xcodeproj/internal/templates/bazel_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ if [[ -n "${SWIFTBUILD_BAZEL_PROXY_INVOCATION_RECEIPT:-}" ]]; then
for option in "${base_pre_config_flags[@]}" "${build_pre_config_flags[@]}"; do
if [[
"$option" != --build_event_json_file=* &&
"$option" != --build_event_max_named_set_of_file_entries=* &&
"$option" != --execution_log_compact_file=* &&
"$option" != --execution_log_json_file=* &&
"$option" != --execution_log_binary_file=* &&
Expand Down
2 changes: 2 additions & 0 deletions xcodeproj/internal/templates/generate_bazel_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ if [[ -n "${SWIFTBUILD_BAZEL_PROXY_BEP_PATH:-}" ]]; then
build_pre_config_flags+=(
"--build_event_publish_all_actions"
"--build_event_json_file=$SWIFTBUILD_BAZEL_PROXY_BEP_PATH"
"--build_event_max_named_set_of_file_entries=256"
)
fi
# The build service gives every operation its own private path. Keep execution metadata attached
Expand Down Expand Up @@ -254,6 +255,7 @@ if [[ -n "${SWIFTBUILD_BAZEL_PROXY_ACTION_GRAPH_PATH:-}" ]]; then
if [[
"$option" != --build_event_publish_all_actions &&
"$option" != --build_event_json_file=* &&
"$option" != --build_event_max_named_set_of_file_entries=* &&
"$option" != --execution_log_compact_file=* &&
"$option" != --execution_log_json_file=* &&
"$option" != --execution_log_binary_file=* &&
Expand Down
Loading