-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
Migrate to an incremental format for MODULE.bazel.lock
#22154
Conversation
1db45d6
to
afb8daf
Compare
14ecf1d
to
b720a41
Compare
I rebased and fixed the remaining tests. This got a bit larger as I reverted some commits instead of adapting their code and removing it in a follow-up PR, but I kept all their tests around that still apply. As a follow-up, I could relatively easily add a new lockfile mode if that's our preferred way of allowing users to refetch mutable registry content. @SalmaSamy I'm not entirely sure how this interacts with |
This reverts commit f042996.
8ad8702
to
b210862
Compare
Forgot to update the test lockfile, hope this is green now. |
@Wyverald The |
I noticed that this patch causes the diff --git a/src/test/tools/bzlmod/BUILD b/src/test/tools/bzlmod/BUILD
index ccaa79a657..a0bbf6bc15 100644
--- a/src/test/tools/bzlmod/BUILD
+++ b/src/test/tools/bzlmod/BUILD
@@ -23,6 +23,5 @@ sh_test(
"//src:bazel",
"//src/test/shell/bazel:test-deps",
],
- tags = ["requires-network"],
deps = ["@bazel_tools//tools/bash/runfiles"],
) Do you know whether I need to do anything more to ensure all tests have access to a repo cache containing the BCR files? It's surprising that no existing test is failing. Edit: Nvm, the repo cache is only used in CI, not locally. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice. I like this new approach and the comments make it much easier to understand too. Let's ship it!!
@bazel-io fork 7.2.0 |
The old lockfile fields and all code related to it as well as the workarounds for local path inclusions are removed. The distribution archive lockfile needs to be checked in temporarily as the main `MODULE.bazel.lock` file does not contain the hashes for the registry files. Fixes #19621 Fixes #20369 RELNOTES: The format for MODULE.bazel.lock is now less likely to result in merge conflicts and is updated incrementally, with only new files downloaded from registries and existing ones taken from the repository cache (if configured). Closes #22154. PiperOrigin-RevId: 633233519 Change-Id: Ie2c3042e4141a36e472b2c25cbd67be4aad096a1
The old lockfile fields and all code related to it as well as the workarounds for local path inclusions are removed.
The distribution archive lockfile needs to be checked in temporarily as the main
MODULE.bazel.lock
file does not contain the hashes for the registry files.Fixes #19621
Fixes #20369
RELNOTES: The format for MODULE.bazel.lock is now less likely to result in merge conflicts and is updated incrementally, with only new files downloaded from registries and existing ones taken from the repository cache (if configured).