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

A merge bot to compliance-trestle. #1716

Open
3 of 4 tasks
butler54 opened this issue Oct 2, 2024 · 6 comments · Fixed by #1753
Open
3 of 4 tasks

A merge bot to compliance-trestle. #1716

butler54 opened this issue Oct 2, 2024 · 6 comments · Fixed by #1753
Assignees
Labels
enhancement New feature or request

Comments

@butler54
Copy link
Collaborator

butler54 commented Oct 2, 2024

Issue description / feature objectives

  • What groups need to approval
  • Do we need codeowners for approval?
  • Two approvers?
  • Which merge bot (tool)

Caveats / Assumptions

  • Documentation required.

Completion Criteria

  • Add CODEOWNERS
  • Setup teams
  • Require two approvers
  • Integrate a merge bot tools
@jpower432
Copy link
Member

I think this tiered contributor approach may be relevant here -> oscal-compass/community#70

@jpower432
Copy link
Member

@butler54 Since this ties into a community proposal, I am willing to work on this issue.

@jpower432 jpower432 self-assigned this Oct 8, 2024
@jpower432
Copy link
Member

Documenting the "why" for this issue as discussed in today's community meeting. @vikas-agarwal76 @mrgadgil Please let me know if you see any inaccuracies per the discussion today.

As it stands today, the typical workflow for pull request merging in compliance-trestle includes one approving review from a person with write permissions and the author must merge their own PRs. Due to this process, PRs from forks or PRs from dependabot are not getting merged right away once requirements are met. With the addition of automatic merging, we require updates to what requirements must be met for approval to ensure the right reviewers are looking at the changes.

@jpower432 jpower432 removed the Backlog label Oct 14, 2024
@jpower432 jpower432 added this to the v3.5.0 milestone Oct 14, 2024
@jpower432 jpower432 moved this from New to Ready in Trestle Roadmap Oct 14, 2024
@jpower432
Copy link
Member

Updates have been made to require two approvals for PRs.

@jpower432 jpower432 moved this from Ready to In progress in Trestle Roadmap Nov 6, 2024
@github-project-automation github-project-automation bot moved this from In progress to Done in Trestle Roadmap Nov 19, 2024
@jpower432 jpower432 reopened this Nov 21, 2024
@jpower432
Copy link
Member

Reopening issue as the last item was not completed.

@jpower432
Copy link
Member

Exploring using the GH cli. You could simply add a step when PRs are opened or synchronized to set auto merge - gh pr merge --squash --auto "1". We could do this based on issue labels to make sure only certain pull request types are merged.

@jpower432 jpower432 removed this from the v3.6.0 milestone Dec 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Status: Done
Development

Successfully merging a pull request may close this issue.

2 participants