[6.3.2] Lockfile updates & fixes (for PR# 19068 and 19105) #19175
Conversation
This file contains 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
* Add 'environ' attribute to module extensions and update lockfile - Add 'environ' to module extensions - Store the variables and their values in the lockfile - Compare the variables and values with the lockfile and re-evaluate or error if they differ PiperOrigin-RevId: 548964193 Change-Id: Ic2d52fe3332e93095c414d8bca4c9b4312bca8c2 # Conflicts: # src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtension.java # src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java # src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java # src/main/java/com/google/devtools/build/lib/skyframe/ActionEnvironmentFunction.java # src/main/java/com/google/devtools/build/lib/skyframe/ClientEnvironmentFunction.java # src/main/java/com/google/devtools/build/lib/starlarkbuildapi/repository/RepositoryModuleApi.java # src/main/java/com/google/devtools/build/skydoc/fakebuildapi/repository/FakeRepositoryModule.java # src/test/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java # src/test/py/bazel/bzlmod/bazel_lockfile_test.py * Remove extra changes * Re-run extension if its files change fixes bazelbuild#19068 PiperOrigin-RevId: 552823534 Change-Id: I87256b2cf954b932e24c70e22386020599f21a6f * Do not fail on new fields added to lockfile data Fixes bazelbuild#19105 PiperOrigin-RevId: 553068023 Change-Id: I877bc8ece0641c01119a9295e09175a2d0a3a0c1 --------- Co-authored-by: Ian (Hee) Cha <heec@google.com>
Wyverald
approved these changes
Aug 4, 2023
copybara-service bot
pushed a commit
that referenced
this pull request
Aug 8, 2023
Baseline: 283ed36 Release Notes: + Ensure that extension unique names followed by `~` are prefix-free (#19167) + Lockfile updates & fixes (#19153) (#19175) + Empty commit to try to fix CI issue (#19177) Acknowledgements: This release contains contributions from many people at Google, as well as bazel.build machine account, Fabian Meumertzheim.
chiragramani
pushed a commit
to uber-common/bazel
that referenced
this pull request
Aug 11, 2023
Baseline: 283ed36 Release Notes: + Ensure that extension unique names followed by `~` are prefix-free (bazelbuild#19167) + Lockfile updates & fixes (bazelbuild#19153) (bazelbuild#19175) + Empty commit to try to fix CI issue (bazelbuild#19177) Acknowledgements: This release contains contributions from many people at Google, as well as bazel.build machine account, Fabian Meumertzheim.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PiperOrigin-RevId: 548964193
Change-Id: Ic2d52fe3332e93095c414d8bca4c9b4312bca8c2
Remove extra changes
Re-run extension if its files change
fixes The module lockfile doesn't contain hashes of files used in extension impl functions #19068
PiperOrigin-RevId: 552823534
Change-Id: I87256b2cf954b932e24c70e22386020599f21a6f
Fixes Adding new fields to the lockfile throws an error asking the user to delete it and rebuild #19105
Commit 1bc0f87
PiperOrigin-RevId: 553068023
Change-Id: I877bc8ece0641c01119a9295e09175a2d0a3a0c1