From f412693f30bb0dc88d764094de5e1574937e9723 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 6 Jan 2017 16:48:30 -0800 Subject: [PATCH 1/5] .pullapprove.yml: List project maintainers separately This repository is managed by the union of all OCI Project maintainers. To avoid having a few active maintainers from one project driving the template in ways that other projects don't support, require at least two approvals from each project. This will slow down acceptance a bit, but many maintainers belong to multiple projects (and their votes will count for each group [1]), so you won't need 12 separate maintainers voting to get a single project-template PR across the line. Also update from config format v1 to v2 [1,2]. [1]: http://docs.pullapprove.com/migrating-to-v2/ [2]: http://docs.pullapprove.com/ Signed-off-by: W. Trevor King --- .pullapprove.yml | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/.pullapprove.yml b/.pullapprove.yml index c361972..a348334 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -1,13 +1,36 @@ -approve_by_comment: true -approve_regex: ^LGTM -reject_regex: ^Rejected -reset_on_push: true -author_approval: ignored -signed_off_by: - required: true -reviewers: - teams: - - tdc-maintainers - - admins - name: default +version: 2 + +requirements: + signed_off_by: + required: true + +group_defaults: required: 2 + approve_by_comment: + enabled: true + approve_regex: ^LGTM + reject_regex: ^Rejected + reset_on_push: + enabled: true + author_approval: + ignored: true + +groups: + image-spec: + teams: + - image-spec-maintainers + image-tools: + teams: + - image-tools-maintainers + go-digest: + teams: + - go-digest-maintainers + runc: + teams: + - runc-maintainers + runtime-spec: + teams: + - runtime-spec-maintainers + runtime-tools: + teams: + - runtime-tools-maintainers From 52bac17d2c8531fede961541cd57e4bad7782a7a Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 6 Jan 2017 16:53:34 -0800 Subject: [PATCH 2/5] .pullapprove.yml: Add an always_pending setting Docs in http://docs.pullapprove.com/groups/always_pending/ The ^ prefix (anchoring the match to the front of the title) is Aleksa's suggestion [1]. [1]: https://github.com/opencontainers/project-template/pull/29#discussion_r106581289 Signed-off-by: W. Trevor King --- .pullapprove.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pullapprove.yml b/.pullapprove.yml index a348334..8a69465 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -4,6 +4,10 @@ requirements: signed_off_by: required: true +always_pending: + title_regex: ^WIP + explanation: 'Work in progress...' + group_defaults: required: 2 approve_by_comment: From dfd50dad2388d45522d76e98f082f88f7c415c82 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 6 Jan 2017 16:58:17 -0800 Subject: [PATCH 3/5] .pullapprove.yml: Only require review for merged into master Docs in http://docs.pullapprove.com/groups/conditions/ Signed-off-by: W. Trevor King --- .pullapprove.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pullapprove.yml b/.pullapprove.yml index 8a69465..9010587 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -18,6 +18,9 @@ group_defaults: enabled: true author_approval: ignored: true + conditions: + branches: + - master groups: image-spec: From a5e7e37470667926c8730db9c2ce475c2d2f8da0 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 6 Jan 2017 17:02:13 -0800 Subject: [PATCH 4/5] .pullapprove.yml: Shift always_pending under group_defaults The main example has it outside [1], but it's a group setting [1], so we can move it inside for consistency [2]. [1]: http://docs.pullapprove.com/ [2]: http://docs.pullapprove.com/pr-settings/group_defaults/ Signed-off-by: W. Trevor King --- .pullapprove.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.pullapprove.yml b/.pullapprove.yml index 9010587..5587a82 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -4,10 +4,6 @@ requirements: signed_off_by: required: true -always_pending: - title_regex: ^WIP - explanation: 'Work in progress...' - group_defaults: required: 2 approve_by_comment: @@ -18,6 +14,9 @@ group_defaults: enabled: true author_approval: ignored: true + always_pending: + title_regex: ^WIP + explanation: 'Work in progress...' conditions: branches: - master From 8feb0fd5d9e78e55e72c9680a3c53e0a76b0bfb1 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 16 Mar 2017 07:56:24 -0700 Subject: [PATCH 5/5] .pullapprove: Add selinux-maintainers This project was initially approved as go-selinux [1] but has since renamed itself to drop the go- prefix [2]. [1]: https://groups.google.com/a/opencontainers.org/forum/#!topic/tob/nH8QU6UnrqA Subject: VOTE Required: approve new project go-selinux Date: Fri, 17 Feb 2017 01:21:37 +0000 Message-ID: [2]: https://github.com/opencontainers/selinux/issues/6#issuecomment-285428099 Signed-off-by: W. Trevor King --- .pullapprove.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pullapprove.yml b/.pullapprove.yml index 5587a82..24b9b25 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -40,3 +40,6 @@ groups: runtime-tools: teams: - runtime-tools-maintainers + selinux: + teams: + - selinux-maintainers