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

Fix _validation output group merging #23676

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

fmeum
Copy link
Collaborator

@fmeum fmeum commented Sep 19, 2024

While cd72583 made it so that a rule and an aspect can both specify validation outputs, it accidentally didn't actually merge the _validation output groups.

By adding the missing merge logic and having the ValidateTarget aspect depend on all other aspects, both a rule and an aspect returning a validation output is now fully supported with --experimental_use_validation_aspect.

Closes #23589.

PiperOrigin-RevId: 675294550
Change-Id: I581417bee223f0b6aedbc0ce71cae75cd6609ef7
(cherry picked from commit 750f0a1)

Fixes #23664

While bazelbuild@cd72583 made it so that a rule and an aspect can both specify validation outputs, it accidentally didn't actually merge the `_validation` output groups.

By adding the missing merge logic and having the `ValidateTarget` aspect depend on all other aspects, both a rule and an aspect returning a validation output is now fully supported with `--experimental_use_validation_aspect`.

Closes bazelbuild#23589.

PiperOrigin-RevId: 675294550
Change-Id: I581417bee223f0b6aedbc0ce71cae75cd6609ef7
(cherry picked from commit 750f0a1)
@fmeum fmeum requested a review from a team as a code owner September 19, 2024 09:54
@fmeum fmeum requested a review from lberki September 19, 2024 09:54
@github-actions github-actions bot added awaiting-review PR is awaiting review from an assigned reviewer team-Configurability platforms, toolchains, cquery, select(), config transitions labels Sep 19, 2024
@lberki
Copy link
Contributor

lberki commented Sep 19, 2024

I assume there was a merge conflict?

@lberki lberki added this pull request to the merge queue Sep 19, 2024
Merged via the queue into bazelbuild:release-7.4.0 with commit ef26873 Sep 19, 2024
51 checks passed
@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Sep 19, 2024
@fmeum fmeum deleted the 23664-cherry branch September 19, 2024 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team-Configurability platforms, toolchains, cquery, select(), config transitions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants