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

Self review option for merge script #3650

Merged

Conversation

HebaruSan
Copy link
Member

Motivation

For a very small, uncontroversial fix like #3649, it may make sense to submit a pull request with documentation of the bug and the fix (so team members know what happened), but then merge it without review, to keep the master branch working.

Currently the merge script from #3263 can't do this because it absolutely requires approval by at least one reviewer. I've been making a live temporary edit to add False and to bypass that check as needed, which is not a great solution.

Changes

Now the merge script has a --self-review option that skips the approval check if present. The default is False (obviously). This should only be used for small fixes in which we have high confidence. This has already been tested in the merge of #3649.

@HebaruSan HebaruSan added Enhancement Easy This is easy to fix Pull request Infrastructure Issues affecting everything around CKAN (the GitHub repos, build process, CI, ...) labels Aug 29, 2022
@HebaruSan HebaruSan merged commit 7022058 into KSP-CKAN:master Aug 29, 2022
@HebaruSan HebaruSan deleted the feature/merge-script-self-review branch August 29, 2022 20:02
@HebaruSan
Copy link
Member Author

HebaruSan commented Aug 30, 2022

a very small, uncontroversial fix

small fixes in which we have high confidence

A further suggestion for the scope of acceptable usage of this option: it should probably also be limited to fixes of unreleased bugs, when we've broken something that was working in the latest release (and therefore the correct behavior is trivial to define and confirm). I think my usages have all been along those lines.

Maybe eventually we can indicate that with GitHub labels, so the --self-review option might print an error unless the PR has the Unreleased Bug label.

@techman83
Copy link
Member

That sounds useful and appropriate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Easy This is easy to fix Enhancement Infrastructure Issues affecting everything around CKAN (the GitHub repos, build process, CI, ...) Pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants