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(ng-dev): force prompt should only ignore the failed validation #730

Closed
wants to merge 6 commits into from

Conversation

devversion
Copy link
Member

Currently when a validation check fails, the caretaker is prompted to
continue forcibly if the failure was non-fatal.

This seemed nice at first glance, but there is a real issue here. The
force merge run might hide actual validations which might have not been
hit before.

To fix this, we introduce an incremental validation system where we run
validations from a config (all by default) and upon failure, if
non-fatal the individual validation can be ignored, re-attempting the
merge.

Also as part of this the validation logic has been refactored/reworked
to individual files with some more complicated wrapper logic that
ensures we properly skip and report validation failures in a safe way.

@devversion devversion requested a review from josephperrott July 20, 2022 16:35
@devversion
Copy link
Member Author

Note: This also enables us to skip the "changes allow for target label" validation, fixing issues like we had last time.

Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love the direction of this but had a question about how we are going about it.

@devversion devversion force-pushed the misc-fixes-merge-tool branch 2 times, most recently from 1b5e9b3 to 3be2001 Compare July 21, 2022 14:18
@devversion devversion requested a review from josephperrott July 21, 2022 16:58
Currently when a validation check fails, the caretaker is prompted to
continue forcibly if the failure was non-fatal.

This seemed nice at first glance, but there is a real issue here. The
force merge run might hide actual validations which might have not been
hit before.

To fix this, we introduce an incremental validation system where we run
validations from a config (all by default) and upon failure, if
non-fatal the individual validation can be ignored, re-attempting the
merge.

Also as part of this the validation logic has been refactored/reworked
to individual files with some more complicated wrapper logic that
ensures we properly skip and report validation failures in a safe way.
@devversion devversion force-pushed the misc-fixes-merge-tool branch from 3be2001 to c6654e4 Compare July 21, 2022 17:36
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@josephperrott josephperrott added the action: merge The PR is ready for merge by the caretaker label Jul 22, 2022
…tion

Do not query active release trains if target labeling is disabled
@devversion devversion force-pushed the misc-fixes-merge-tool branch from 9aa5366 to af4b7ad Compare July 23, 2022 12:14
@devversion
Copy link
Member Author

This PR was merged into the repository by commit 0f1cace.

@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Aug 23, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants