Make MODULE.bazel.lock deterministic
#19339
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
awaiting-review
fmeum
force-pushed
the
deterministic-lockfile
branch
from
b6ab7f7 to
017112c
Compare
Wyverald
reviewed
Aug 25, 2023
src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java
Outdated
Show resolved
Hide resolved
Sorts the extensions, which would otherwise be added in the non-deterministic order in which module extension resolution events are fired, by their ID.
fmeum
force-pushed
the
deterministic-lockfile
branch
from
017112c to
b04a445
Compare
meteorcloudy
approved these changes
Aug 28, 2023
Member
meteorcloudy
left a comment
meteorcloudy
left a comment
There was a problem hiding this comment.
Nit: is there any simple way to test this?
Collaborator
Author
While not a dedicated test for this purpose, #19343 generates a lockfile twice and compares the outcomes. We could have an additional test with more extensions, but it may still not fail reliably in the face of actual non-determinism. |
Member
|
OK, I'm fine with the test in #19343 |
meteorcloudy
added
awaiting-PR-merge
SalmaSamy
approved these changes
Aug 28, 2023
github-actions
bot
removed
the
awaiting-PR-merge
Collaborator
Author
|
@bazel-io flag |
bazel-io
added
the
potential release blocker
Collaborator
Author
|
@SalmaSamy Just saw that Git authorship wasn't preserved for the commit. Not a big deal, but maybe the way this was merged internally needs to be adjusted for future commits? |
Member
|
Yes, we should not push the update mater branch by merge button for normal PRs. |
Member
|
@bazel-io fork 6.4.0 |
bazel-io
removed
the
potential release blocker
This was referenced Aug 29, 2023
bazel-io
pushed a commit
to bazel-io/bazel
that referenced
this pull request
Aug 29, 2023
Sorts the extensions, which would otherwise be added in the non-deterministic order in which module extension resolution events are fired, by their ID. Since Gson doesn't support custom comparators on a `TreeMap`, `ModuleExtensionId` now implements `Comparable` directly. Closes bazelbuild#19339. PiperOrigin-RevId: 560959804 Change-Id: Ic5579c032e6cd32fe4bd2114378812c0110109c2
iancha1992
pushed a commit
to iancha1992/bazel
that referenced
this pull request
Aug 30, 2023
Sorts the extensions, which would otherwise be added in the non-deterministic order in which module extension resolution events are fired, by their ID. Since Gson doesn't support custom comparators on a `TreeMap`, `ModuleExtensionId` now implements `Comparable` directly. Closes bazelbuild#19339. PiperOrigin-RevId: 560959804 Change-Id: Ic5579c032e6cd32fe4bd2114378812c0110109c2
iancha1992
added a commit
that referenced
this pull request
Aug 31, 2023
Sorts the extensions, which would otherwise be added in the non-deterministic order in which module extension resolution events are fired, by their ID. Since Gson doesn't support custom comparators on a `TreeMap`, `ModuleExtensionId` now implements `Comparable` directly. Closes #19339. Commit ede4d49 PiperOrigin-RevId: 560959804 Change-Id: Ic5579c032e6cd32fe4bd2114378812c0110109c2 Co-authored-by: Fabian Meumertzheim <[email protected]>
Member
|
The changes in this PR have been included in Bazel 6.4.0 RC1. Please test out the release candidate and report any issues as soon as possible. If you're using Bazelisk, you can point to the latest RC by setting USE_BAZEL_VERSION=last_rc. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sorts the extensions, which would otherwise be added in the non-deterministic order in which module extension resolution events are fired, by their ID.
Since Gson doesn't support custom comparators on a
TreeMap,ModuleExtensionIdnow implementsComparabledirectly.