From da090bd22db34bd903cbd8c1c8a3db932cfede75 Mon Sep 17 00:00:00 2001 From: Clare Liguori Date: Wed, 4 Mar 2020 22:19:39 -0800 Subject: [PATCH] chore: setup automatic merging --- .dependabot/config.yml | 4 ++++ .mergify.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .mergify.yml diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 4b60286..a5dd1c5 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -3,3 +3,7 @@ update_configs: - package_manager: "javascript" directory: "/" update_schedule: "monthly" + automerged_updates: + - match: + dependency_type: "all" + update_type: "semver:minor" diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..86cd00c --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,32 @@ +pull_request_rules: + - name: Automatically merge on CI success and review approval + conditions: + - base~=master|integ-tests + - "#approved-reviews-by>=1" + - approved-reviews-by=@aws-actions/aws-ecs-devx + - -approved-reviews-by~=author + - status-success=Run Unit Tests + - status-success=Semantic Pull Request + - label!=work-in-progress + - -title~=(WIP|wip) + - -merged + - -closed + - author!=dependabot[bot] + - author!=dependabot-preview[bot] + actions: + merge: + method: squash + strict: smart + strict_method: merge + + - name: Automatically approve Dependabot PRs + conditions: + - base=master + - author~=^dependabot(|-preview)\[bot\]$ + - -title~=(WIP|wip) + - -label~=(blocked|do-not-merge) + - -merged + - -closed + actions: + review: + type: APPROVE