From f3eaa9e89384e6d22df276053b175cd8df9ee1ff Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Tue, 13 Sep 2022 16:48:45 +0100 Subject: [PATCH 1/4] [GOV]: Update CONTRIBUTING file Based on the TSC discussion on 2022.09.13 (https://wiki.anuket.io/display/HOME/2022-09-13+TSC++Agenda+and+Minutes) Signed-off-by: Gergely Csatari --- CONTRIBUTING.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 0ff37b232e..120d5c5332 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -169,6 +169,13 @@ Pull Requests Approval Process PR Approval Process +- If the PR is only introducing minor changes which to not change the original meaning of the text or if the PR changes + only the files used to compile the documentation and automate the compilation + + - There is only one approval is needed to get the PR merged. + - The approver needs work for a different company than the creator of the PR + + Idle Pull Requests Policy ------------------------- From bc607ff6fe99a8b5c538a21a3391559e757e85ef Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Wed, 14 Sep 2022 13:32:21 +0100 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Pankaj Goyal <52107136+pgoyal01@users.noreply.github.com> --- CONTRIBUTING.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 120d5c5332..4a1fc388ef 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -169,10 +169,10 @@ Pull Requests Approval Process PR Approval Process -- If the PR is only introducing minor changes which to not change the original meaning of the text or if the PR changes - only the files used to compile the documentation and automate the compilation +- If a PR is making minor changes that do not change the original meaning of the text or if the PR changes + only the files used to compile the documentation and automate the compilation, then: - - There is only one approval is needed to get the PR merged. + - only one approval is needed to get the PR merged - The approver needs work for a different company than the creator of the PR From 363dd87b30bebc49341be6fba709831a7b3a5dcd Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Wed, 14 Sep 2022 13:37:33 +0100 Subject: [PATCH 3/4] [GOV]: Removing of different company requirement Signed-off-by: Gergely Csatari --- CONTRIBUTING.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 4a1fc388ef..498b715f7b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -173,8 +173,6 @@ Pull Requests Approval Process only the files used to compile the documentation and automate the compilation, then: - only one approval is needed to get the PR merged - - The approver needs work for a different company than the creator of the PR - Idle Pull Requests Policy ------------------------- From f4a0449494655bd40a72cd06e872064a342063ca Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Thu, 27 Jul 2023 14:25:40 +0300 Subject: [PATCH 4/4] [GOV]: Adding PTL exception for PR merge process Signed-off-by: Gergely Csatari --- CONTRIBUTING.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 498b715f7b..46bf0df2e2 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -170,7 +170,8 @@ Pull Requests Approval Process PR Approval Process - If a PR is making minor changes that do not change the original meaning of the text or if the PR changes - only the files used to compile the documentation and automate the compilation, then: + only the files used to compile the documentation and automate the compilation or if the PTL of the sub-project decides + so, then: - only one approval is needed to get the PR merged