Skip to content

Conversation

@bazel-io
Copy link
Member

JSON-based merge conflict resolution for MODULE.bazel.lock can end up producing entries with, e.g., both a general and an os:Linux factor result when the OS/arch dependence of the extension changes. BazelLockFileModule now invalidates each factor result individually.

Also sort the extension factors.

Closes #22378.

PiperOrigin-RevId: 635913837
Change-Id: I0064098806c856f16e8f4c0270f609f06cebc945

Commit c4092e9

JSON-based merge conflict resolution for `MODULE.bazel.lock` can end up producing entries with, e.g., both a `general` and an `os:Linux` factor result when the OS/arch dependence of the extension changes. `BazelLockFileModule` now invalidates each factor result individually.

Also sort the extension factors.

Closes bazelbuild#22378.

PiperOrigin-RevId: 635913837
Change-Id: I0064098806c856f16e8f4c0270f609f06cebc945
@bazel-io bazel-io added team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file. awaiting-review PR is awaiting review from an assigned reviewer labels May 21, 2024
@bazel-io bazel-io requested a review from a team as a code owner May 21, 2024 20:43
@bazel-io bazel-io requested a review from Wyverald May 21, 2024 20:43
@Wyverald Wyverald enabled auto-merge May 21, 2024 20:49
@Wyverald Wyverald added this pull request to the merge queue May 21, 2024
Merged via the queue into bazelbuild:release-7.2.0 with commit 37661b2 May 21, 2024
@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants