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

amend merge criteria #187

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

amend merge criteria #187

wants to merge 1 commit into from

Conversation

cdoern
Copy link
Contributor

@cdoern cdoern commented Jan 31, 2025

the rule that the Oversight Committee needs to merge every dev-doc PR has not scaled with the project. We now write dev-docs for most design changes for any instructlab repo. This rule has also not regularly been followed. Amend this rule such that 2 maintainers of any instructlab can approve a PR and a third maintainer of any instructlab repo can verify that sufficient reviews have been given and merge a PR

Copy link
Contributor

@jwm4 jwm4 left a comment

Choose a reason for hiding this comment

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

This seems like a good improvement. I would like to see broader reform of the process too, but I would say let's move forward with this incremental improvement first and then make other improvements later too.

README.md Outdated
@@ -24,7 +24,7 @@ please ping the Oversight Committee for help.
out from maintainers of relevant components. The broader the scope or more
controversial the change, the more broad the consensus should be required for
merging. The final approval and merge (or action, e.g. deleting a repo)
falls to a member of the Oversight Committee. This final review is to ensure that
falls to a member of the Oversight Committee, 2 Maintainers of any InstructLab Organization repository, or any 2 Organization owners. This final review is to ensure that
Copy link

Choose a reason for hiding this comment

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

Would be nice to keep wrapping consistent...

Copy link

@booxter booxter left a comment

Choose a reason for hiding this comment

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

This would have to be approved by OC members though.

README.md Outdated
@@ -24,7 +24,7 @@ please ping the Oversight Committee for help.
out from maintainers of relevant components. The broader the scope or more
controversial the change, the more broad the consensus should be required for
merging. The final approval and merge (or action, e.g. deleting a repo)
falls to a member of the Oversight Committee. This final review is to ensure that
falls to a member of the Oversight Committee, 2 Maintainers of any InstructLab Organization repository, or any 2 Organization owners. This final review is to ensure that
Copy link
Member

Choose a reason for hiding this comment

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

My hope is we won't use Org Owners very much in the future, and we can stick to positions with more power in the org being more democractic - that being said, I'd prefer the following text

Suggested change
falls to a member of the Oversight Committee, 2 Maintainers of any InstructLab Organization repository, or any 2 Organization owners. This final review is to ensure that
falls to either **one** member of the Oversight Committee or **three** Maintainers of any InstructLab Organization repository. This final review is to ensure that

Copy link
Contributor

@jwm4 jwm4 Jan 31, 2025

Choose a reason for hiding this comment

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

As written, it sounds like it requires three people who are all maintainers of the same InstructLab Organization repository. However, I think it would be better if it were any three people each of whom are a maintainer of at least one InstructLab Organization repository. Maybe a concise way to write that would be "three InstructLab repository maintainers"?

README.md Outdated Show resolved Hide resolved
@cdoern
Copy link
Contributor Author

cdoern commented Jan 31, 2025

made some amendments @danmcp @nathan-weinberg lmk if they fit both of the criteria you wanted

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@lhawthorn
Copy link
Member

I have reviewed the comment history and am in agreement with @danmcp current requested changes. Please make these updates and, once they are done, I will ensure the rest of the oversight committee reviews. In order to ensure that we are not blocked on a busy oversight committee - the very reason we need to make this particular change - I am going to timebox review to 5 days from time of updates addressing @danmcp's comments above.

Thank you @cdoern for your diligence in making this proposal, @nathan-weinberg for your review and excellent suggestions to improve the PR, and @booxter for your feedback.

the rule that the Oversight Committee needs to merge every dev-doc PR has not scaled with the project. We now write dev-docs for most design changes for any instructlab repo. This rule has also not regularly been followed.
Amend this rule such that 2 maintainers of any instructlab can approve a PR and a third maintainer of any instructlab repo can verify that sufficient reviews have been given and merge a PR

Signed-off-by: Charlie Doern <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants