Ian (Hee) Cha
Ian (Hee) Cha
cc: @fmeum @rickeylev
@fmeum do you still want to merge this?
The changes in this PR have been included in [Bazel 7.2.0 RC1](https://github.com/bazelbuild/bazel/releases/tag/7.2.0rc1). Please test out the release candidate and report any issues as soon as possible. If you're using Bazelisk,...
> Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually. > > `MODULE.bazel.lock` `src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java` `src/test/java/com/google/devtools/build/lib/skyframe/config/PlatformMappingFunctionParserTest.java` `src/test/java/com/google/devtools/build/lib/skyframe/config/PlatformMappingValueTest.java` > > cc: @bazelbuild/triage cc: @fmeum @Wyverald
> Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually. > > `src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java` `src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java` > > cc: @bazelbuild/triage @fmeum @Wyverald
> Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually. > > `MODULE.bazel.lock` `src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java` `src/test/tools/bzlmod/MODULE.bazel.lock` > > cc: @bazelbuild/triage cc: @fmeum @Wyverald @meteorcloudy
Bazel 7.2.0rc1 is now available for those that want to try it out. You can download it from here: https://github.com/bazelbuild/bazel/releases/tag/7.2.0rc1 If you're using Bazelisk, you can point to this RC...
> @comius @iancha1992 Friendly ping, is this still on track for merging? @fmeum Yes. We are currently working on this :)
@fmeum can you please resolve the conflicts from `src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java`? There is a conflict that I could not resolve on my own from the file. Thanks :)
@bazel-io fork 7.4.0