diff --git a/.bazelrc b/.bazelrc index c6b618d3ac5..aef6aec367d 100644 --- a/.bazelrc +++ b/.bazelrc @@ -102,13 +102,13 @@ common:windows --repo_env=MONGO_VC_REDIST_FULL_VERSION=v143 common --strategy=CppLink=local common --strategy=CppArchive=local common --strategy=SolibSymlink=local -common --strategy=StripDebuginfo=local -common --strategy=ExtractDebuginfo=local +common --strategy=StripDebugInfo=local +common --strategy=ExtractDebugInfo=local common --strategy=TestRunner=local common --strategy=CoverageReport=local common --strategy=CcGenerateIntermediateDwp=local common --strategy=CcGenerateDwp=local -common --modify_execution_info=^(TestRunner|CppLink|CppArchive|SolibSymlink|ExtractDebuginfo|StripDebuginfo|CcGenerateIntermediateDwp|CcGenerateDwp)$=+no-remote-cache +common --modify_execution_info=^(TestRunner|CppLink|CppArchive|SolibSymlink|ExtractDebugInfo|StripDebugInfo|CcGenerateIntermediateDwp|CcGenerateDwp)$=+no-remote-cache # Global clang tidy flags to avoid invalidating analysis cache between clang-tidy / regular runs common --@bazel_clang_tidy//:clang_tidy_excludes=".pb.cc,icu_init.cpp" @@ -418,7 +418,7 @@ common:remote_test --strategy=TestRunner=remote common:remote_test --features=-thin_archive common:remote_test --remote_download_outputs=minimal common:remote_test --test_output=summary -common:remote_test --modify_execution_info=^(CppLink|CppArchive|SolibSymlink|ExtractDebuginfo|StripDebuginfo|CcGenerateIntermediateDwp|CcGenerateDwp)$=-no-remote-cache +common:remote_test --modify_execution_info=^(CppLink|CppArchive|SolibSymlink|ExtractDebugInfo|StripDebugInfo|CcGenerateIntermediateDwp|CcGenerateDwp)$=-no-remote-cache common:remote_test --remote_download_regex=.*(TestLogs.*|report.*\.json$|\.core$|data_archives.*\.tgz$) # Resmoke TestLogs directory, report, core dumps, and data directory archives. test:remote_test --test_timeout=660 # Allow extra 60s for coredump on abort test:remote_test --test_tag_filters=-incompatible_with_bazel_remote_test diff --git a/bazel/separate_debug.bzl b/bazel/separate_debug.bzl index e228e7bb473..f257f185382 100644 --- a/bazel/separate_debug.bzl +++ b/bazel/separate_debug.bzl @@ -310,7 +310,7 @@ def linux_extraction(ctx, cc_toolchain, inputs): input_bin.path, debug_info.path, ], - mnemonic = "ExtractDebuginfo", + mnemonic = "ExtractDebugInfo", ) ctx.actions.run( @@ -325,7 +325,7 @@ def linux_extraction(ctx, cc_toolchain, inputs): input_bin.path, output_bin.path, ], - mnemonic = "StripDebuginfo", + mnemonic = "StripDebugInfo", ) outputs += [output_bin, debug_info] else: @@ -397,7 +397,7 @@ def macos_extraction(ctx, cc_toolchain, inputs): "-o", debug_info.path, ], - mnemonic = "ExtractDebuginfo", + mnemonic = "ExtractDebugInfo", ) ctx.actions.run( @@ -410,7 +410,7 @@ def macos_extraction(ctx, cc_toolchain, inputs): output_bin.path, input_bin.path, ], - mnemonic = "StripDebuginfo", + mnemonic = "StripDebugInfo", ) outputs += [output_bin, debug_info] else: