Skip to content
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated 89 files
+10 −2 scripts/bazel-lockfile-merge.jq
+110 −0 scripts/bazel_lockfile_merge_test.sh
+0 −5 site/en/community/_index.yaml
+3 −2 site/en/docs/bazel-and-java.md
+31 −4 site/en/external/extension.md
+3 −7 src/BUILD
+0 −6 src/main/java/com/google/devtools/build/lib/BUILD
+4 −0 src/main/java/com/google/devtools/build/lib/analysis/Project.java
+33 −9 src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
+9 −0 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD
+13 −2 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java
+6 −1 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileValue.java
+185 −0 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Facts.java
+71 −0 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/FactsAdapter.java
+1 −0 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GsonTypeAdapterUtil.java
+3 −2 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InnateRunnableExtension.java
+3 −1 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModule.java
+6 −3 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/LockFileModuleExtension.java
+287 −0 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/LockfileModuleExtensionMetadata.java
+54 −2 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionContext.java
+27 −232 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionMetadata.java
+13 −0 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java
+18 −8 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java
+3 −2 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RunnableExtension.java
+49 −26 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java
+4 −1 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionValue.java
+0 −9 src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
+2 −0 src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
+8 −0 src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+18 −5 src/main/java/com/google/devtools/build/lib/concurrent/QuiescingFuture.java
+2 −0 src/main/java/com/google/devtools/build/lib/remote/RemoteExecutionService.java
+21 −3 src/main/java/com/google/devtools/build/lib/remote/RemoteOutputChecker.java
+6 −4 src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+12 −0 src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+0 −7 src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
+2 −1 src/main/java/com/google/devtools/build/lib/runtime/commands/AqueryCommand.java
+1 −16 src/main/java/com/google/devtools/build/lib/runtime/commands/CqueryCommand.java
+25 −3 src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommandUtils.java
+2 −0 src/main/java/com/google/devtools/build/lib/skyframe/ProjectFunction.java
+5 −1 src/main/java/com/google/devtools/build/lib/skyframe/ProjectValue.java
+212 −19 src/main/java/com/google/devtools/build/lib/skyframe/config/FlagSetFunction.java
+4 −0 src/main/java/com/google/devtools/build/lib/skyframe/config/FlagSetValue.java
+11 −2 src/main/java/net/starlark/java/BUILD
+1 −1 src/main/java/net/starlark/java/annot/BUILD
+1 −1 src/main/java/net/starlark/java/eval/BUILD
+1 −1 src/main/java/net/starlark/java/eval/ImmutableStarlarkList.java
+1 −1 src/main/java/net/starlark/java/eval/MutableStarlarkList.java
+1 −1 src/main/java/net/starlark/java/eval/RegularTuple.java
+1 −5 src/main/java/net/starlark/java/eval/Starlark.java
+2 −0 src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl
+5 −2 src/main/starlark/builtins_bzl/common/cc/compile/cc_compilation_helper.bzl
+9 −7 src/main/starlark/builtins_bzl/common/cc/compile/compile.bzl
+5 −5 src/main/starlark/builtins_bzl/common/cc/compile/compile_action_templates.bzl
+10 −11 src/main/starlark/builtins_bzl/common/cc/fdo/fdo_context.bzl
+0 −3 src/test/java/com/google/devtools/build/lib/BUILD
+6 −2 src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModuleTest.java
+128 −1 src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
+46 −1 src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
+16 −1 src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD
+1 −269 src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java
+296 −0 src/test/java/com/google/devtools/build/lib/buildeventservice/DelayingPublishBuildEventService.java
+28 −5 src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
+0 −5 src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
+3 −3 src/test/java/com/google/devtools/build/lib/runtime/commands/QueryCommandUtilsTest.java
+2 −0 src/test/java/com/google/devtools/build/lib/skyframe/ProjectFunctionTest.java
+140 −63 src/test/java/com/google/devtools/build/lib/skyframe/config/FlagSetFunctionTest.java
+16 −0 src/test/java/net/starlark/java/BUILD
+1 −1 src/test/java/net/starlark/java/eval/BUILD
+143 −71 src/test/java/net/starlark/java/syntax/NodePrinterTest.java
+248 −0 src/test/py/bazel/bzlmod/bazel_lockfile_test.py
+2 −3 src/test/py/bazel/bzlmod/bazel_module_test.py
+61 −0 src/test/py/bazel/bzlmod/bazel_overrides_test.py
+85 −0 src/test/shell/bazel/remote/build_without_the_bytes_test.sh
+1 −1 src/test/shell/bazel/remote/remote_utils.sh
+2 −1 src/test/tools/bzlmod/MODULE.bazel.lock
+36 −1 src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/OnDiskBlobStoreCache.java
+1 −1 src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java
+10 −0 src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorkerOptions.java
+ third_party/asm/asm-9.9-sources.jar
+ third_party/asm/asm-9.9.jar
+ third_party/asm/asm-analysis-9.9-sources.jar
+ third_party/asm/asm-analysis-9.9.jar
+ third_party/asm/asm-commons-9.9-sources.jar
+ third_party/asm/asm-commons-9.9.jar
+ third_party/asm/asm-tree-9.9-sources.jar
+ third_party/asm/asm-tree-9.9.jar
+ third_party/asm/asm-util-9.9-sources.jar
+ third_party/asm/asm-util-9.9.jar
+3 −3 third_party/java/jacoco/BUILD