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.

Sign up for GitHub

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

Jump to bottom

[6.4.0] Lockfile updates & fixes #19153

Merged
merged 5 commits into from
Aug 4, 2023
Merged

[6.4.0] Lockfile updates & fixes #19153

merged 5 commits into from
Aug 4, 2023

Commits on Aug 3, 2023

  1. 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
    @SalmaSamy
    SalmaSamy committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    a1fff4b View commit details
    Browse the repository at this point in the history

  2. Remove extra changes

    @SalmaSamy
    SalmaSamy committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    25856b3 View commit details
    Browse the repository at this point in the history

  3. Re-run extension if its files change 

    fixes #19068

PiperOrigin-RevId: 552823534
Change-Id: I87256b2cf954b932e24c70e22386020599f21a6f
    @SalmaSamy
    SalmaSamy committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    0ba107b View commit details
    Browse the repository at this point in the history

  4. Do not fail on new fields added to lockfile data 

    Fixes #19105

PiperOrigin-RevId: 553068023
Change-Id: I877bc8ece0641c01119a9295e09175a2d0a3a0c1
    @SalmaSamy
    SalmaSamy committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    4203aec View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release-6.4.0' into lockfile-fixes

    @iancha1992
    iancha1992 authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ead8eb5 View commit details
    Browse the repository at this point in the history