Skip to content
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

Jump to bottom

[6.0.0]Add --experimental_action_cache_store_output_metadata to the expansio… #16740

Merged
merged 3 commits into from
Nov 14, 2022
Merged

[6.0.0]Add --experimental_action_cache_store_output_metadata to the expansio… #16740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b50dba
Add --experimental_action_cache_store_output_metadata to the expansio…
coeuvre Nov 9, 2022
852fab2
Merge branch 'release-6.0.0' into ks/cherry-pick16720
ShreeM01 Nov 13, 2022
66e3622
Merge branch 'release-6.0.0' into ks/cherry-pick16720
ShreeM01 Nov 14, 2022
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
16 changes: 10 additions & 6 deletions src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,15 +473,17 @@ public RemoteOutputsStrategyConverter() {
"--nobuild_runfile_links",
"--experimental_inmemory_jdeps_files",
"--experimental_inmemory_dotd_files",
"--experimental_action_cache_store_output_metadata",
"--remote_download_outputs=minimal"
},
category = "remote",
documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
help =
"Does not download any remote build outputs to the local machine. This flag is a "
+ "shortcut for three flags: --experimental_inmemory_jdeps_files, "
+ "--experimental_inmemory_dotd_files and "
"Does not download any remote build outputs to the local machine. This flag is a shortcut"
+ " for flags: --experimental_inmemory_jdeps_files,"
+ " --experimental_inmemory_dotd_files,"
+ " --experimental_action_cache_store_output_metadata and "
+ "--remote_download_outputs=minimal.")
public Void remoteOutputsMinimal;

Expand All @@ -492,15 +494,17 @@ public RemoteOutputsStrategyConverter() {
expansion = {
"--experimental_inmemory_jdeps_files",
"--experimental_inmemory_dotd_files",
"--experimental_action_cache_store_output_metadata",
"--remote_download_outputs=toplevel"
},
category = "remote",
documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
help =
"Only downloads remote outputs of top level targets to the local machine. This flag is a "
+ "shortcut for three flags: --experimental_inmemory_jdeps_files, "
+ "--experimental_inmemory_dotd_files and "
"Only downloads remote outputs of top level targets to the local machine. This flag is a"
+ " shortcut for flags: --experimental_inmemory_jdeps_files,"
+ " --experimental_inmemory_dotd_files,"
+ " --experimental_action_cache_store_output_metadata and "
+ "--remote_download_outputs=toplevel.")
public Void remoteOutputsToplevel;

Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ protected void setupOptions() throws Exception {
addOptions(
"--remote_executor=grpc://localhost:" + worker.getPort(),
"--remote_download_minimal",
"--experimental_action_cache_store_output_metadata",
"--dynamic_local_strategy=standalone",
"--dynamic_remote_strategy=remote");
}
Expand Down
12 changes: 0 additions & 12 deletions src/test/shell/bazel/remote/build_without_the_bytes_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ EOF

bazel build \
--experimental_ui_debug_all_events \
--experimental_action_cache_store_output_metadata \
--remote_executor=grpc://localhost:${worker_port} \
--remote_download_minimal \
//a:foobar >& $TEST_log || fail "Failed to build //a:foobar"
Expand All @@ -171,7 +170,6 @@ EOF

bazel build \
--experimental_ui_debug_all_events \
--experimental_action_cache_store_output_metadata \
--remote_executor=grpc://localhost:${worker_port} \
--remote_download_minimal \
//a:foobar >& $TEST_log || fail "Failed to build //a:foobar"
Expand Down Expand Up @@ -1173,14 +1171,6 @@ EOF
}

function test_download_toplevel_when_turn_remote_cache_off() {
download_toplevel_when_turn_remote_cache_off
}

function test_download_toplevel_when_turn_remote_cache_off_with_metadata() {
download_toplevel_when_turn_remote_cache_off --experimental_action_cache_store_output_metadata
}

function download_toplevel_when_turn_remote_cache_off() {
# Test that BwtB doesn't cause build failure if remote cache is disabled in a following build.
# See https://github.com/bazelbuild/bazel/issues/13882.

Expand Down Expand Up @@ -1215,7 +1205,6 @@ EOF
bazel build \
--remote_cache=grpc://localhost:${worker_port} \
--remote_download_toplevel \
"$@" \
//a:consumer >& $TEST_log || fail "Failed to download outputs"
[[ -f bazel-bin/a/a.txt ]] || [[ -f bazel-bin/a/b.txt ]] \
&& fail "Expected outputs of producer are not downloaded"
Expand All @@ -1224,7 +1213,6 @@ EOF
echo 'bar' > a/in.txt
bazel build \
--remote_download_toplevel \
"$@" \
//a:consumer >& $TEST_log || fail "Failed to build without remote cache"
}

Expand Down