From 9701816a424ce762e9a2edc5ff89110686b0ba6c Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Fri, 22 Jan 2021 10:55:15 -0800 Subject: [PATCH 1/6] add required review on master --- .asf.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index ec4e427405c77..f337421f85787 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -52,3 +52,8 @@ github: squash: true merge: false rebase: false + + protected_branches: + master: + required_pull_request_reviews: + required_approving_review_count: 1 From c0577873d271b18c310e44c6a9d1634c67a4e7da Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Fri, 22 Jan 2021 13:41:28 -0800 Subject: [PATCH 2/6] update to include all items in required reviews --- .asf.yaml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index f337421f85787..5c613c00e742a 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -53,7 +53,23 @@ github: merge: false rebase: false - protected_branches: - master: - required_pull_request_reviews: - required_approving_review_count: 1 + protected_branches: + master: + required_status_checks: + # strict means "Require branches to be up to date before merging". + strict: false + # contexts are the names of checks that must pass + contexts: + - Docker/build + - Frontend/build + - PR Lint/check + - E2E/Cypress + - lint + - test-mysql + - test-postgres + - test-sqlite + + required_pull_request_reviews: + dismiss_stale_reviews: true + require_code_owner_reviews: true + required_approving_review_count: 1 From 53aac6675fd475c6bba0a6e4dd2974cbe2eef4d2 Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Fri, 22 Jan 2021 15:48:00 -0800 Subject: [PATCH 3/6] change value on dismiss stale reviews --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 5c613c00e742a..83a97bb7d7104 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -70,6 +70,6 @@ github: - test-sqlite required_pull_request_reviews: - dismiss_stale_reviews: true + dismiss_stale_reviews: false require_code_owner_reviews: true required_approving_review_count: 1 From 9e9bb9aa934e187eae3218c23e51859ce15114c2 Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Fri, 22 Jan 2021 16:00:50 -0800 Subject: [PATCH 4/6] add more action names to checks --- .asf.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 83a97bb7d7104..21c84bb9298b2 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -64,10 +64,10 @@ github: - Frontend/build - PR Lint/check - E2E/Cypress - - lint - - test-mysql - - test-postgres - - test-sqlite + - Python Misc/lint + - Python MySQL/test-mysql + - Python MySQL/test-postgres + - Python MySQL/test-sqlite required_pull_request_reviews: dismiss_stale_reviews: false From 26c6957f6110b8907256fe5f284ac3f043f8f930 Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Tue, 26 Jan 2021 16:14:16 -0800 Subject: [PATCH 5/6] add just one required action to test --- .asf.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 21c84bb9298b2..5aa37211395c7 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -54,20 +54,13 @@ github: rebase: false protected_branches: - master: + infra_reviewer_updates: required_status_checks: # strict means "Require branches to be up to date before merging". strict: false # contexts are the names of checks that must pass contexts: - - Docker/build - - Frontend/build - - PR Lint/check - - E2E/Cypress - - Python Misc/lint - - Python MySQL/test-mysql - - Python MySQL/test-postgres - - Python MySQL/test-sqlite + - PR Lint / check required_pull_request_reviews: dismiss_stale_reviews: false From 97b93c2a76cd1950517218a7a9f4cf3f484a4179 Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Wed, 27 Jan 2021 12:49:52 -0800 Subject: [PATCH 6/6] use job name --- .asf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 5aa37211395c7..bf68db38f4629 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -54,13 +54,13 @@ github: rebase: false protected_branches: - infra_reviewer_updates: + master: required_status_checks: # strict means "Require branches to be up to date before merging". strict: false # contexts are the names of checks that must pass contexts: - - PR Lint / check + - check required_pull_request_reviews: dismiss_stale_reviews: false