Skip to content
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

[6.3.2] Lockfile updates & fixes (for PR# 19068 and 19105) #19175

Merged
merged 1 commit into from
Aug 4, 2023

Commits on Aug 4, 2023

  1. [6.4.0] Lockfile updates & fixes (bazelbuild#19153)

    * 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>
    SalmaSamy and iancha1992 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    5e9d3e3 View commit details
    Browse the repository at this point in the history