From 0fcbca5ff75a81ac5abaf91a0e2a376c82220c63 Mon Sep 17 00:00:00 2001 From: Noah Litov Date: Wed, 31 Jul 2019 21:02:19 -0700 Subject: [PATCH 1/4] Added mergify config --- .mergify.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000000000..87555d41d58a0 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,23 @@ +# ******************************* +# Mergidy.io Config File +# +# See https://doc.mergify.io for +# more info on config files +# ******************************* + +pull_request_rules: +- name: auto_merge + conditions: + - -title~=(WIP|wip) + - -merged + - -closed + - -locked + - -label=blocked + - "#approved-reviews-by>=1" + - "#changes-requested-reviews-by=0" + - status-success=continuous-integration/travis-ci/pr + - status-success=AWS CodeBuild us-east-1 (aws-cdk-build) + actions: + merge: + method: squash + strict: smart \ No newline at end of file From b9e5d13ec0df52102d2be3df07d79fb6a5bbb705 Mon Sep 17 00:00:00 2001 From: Noah Litov Date: Wed, 31 Jul 2019 21:04:00 -0700 Subject: [PATCH 2/4] Added missing newline --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 87555d41d58a0..706fdf4b2b263 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -20,4 +20,4 @@ pull_request_rules: actions: merge: method: squash - strict: smart \ No newline at end of file + strict: smart From 72ea336ba495680b8a1cadfb30842fe5448083f4 Mon Sep 17 00:00:00 2001 From: Noah Litov Date: Wed, 31 Jul 2019 21:07:03 -0700 Subject: [PATCH 3/4] fixed ugly header --- .mergify.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 706fdf4b2b263..4a52c36730da3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,9 +1,4 @@ -# ******************************* -# Mergidy.io Config File -# -# See https://doc.mergify.io for -# more info on config files -# ******************************* +# See https://doc.mergify.io pull_request_rules: - name: auto_merge From 274fbb11b83a3934609b60ce6de887d51dcadd8f Mon Sep 17 00:00:00 2001 From: Noah Litov Date: Thu, 1 Aug 2019 10:59:17 -0700 Subject: [PATCH 4/4] Update .mergify.yml --- .mergify.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 4a52c36730da3..aed2c21288df7 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,7 +10,6 @@ pull_request_rules: - -label=blocked - "#approved-reviews-by>=1" - "#changes-requested-reviews-by=0" - - status-success=continuous-integration/travis-ci/pr - status-success=AWS CodeBuild us-east-1 (aws-cdk-build) actions: merge: