From 7c42504d6809fae31fba039c498153138e669a64 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 25 Jun 2020 21:05:40 +0300 Subject: [PATCH 1/2] Mergify: configuration update --- .mergify.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..e7c13d0 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,9 @@ +pull_request_rules: + - name: Automatic merge on approval + conditions: + - label=automerge + - status-success=continuous-integration/travis-ci/pr + - status-success=continuous-integration/travis-ci/push + actions: + merge: + method: merge From 43971c05fdcbc3e60a3cc9f36454216db3acdc6f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 25 Jun 2020 21:09:46 +0300 Subject: [PATCH 2/2] Also require GHA lint The checks show up like this: Lint / build (pull_request) Lint / build (push) And the condition needs to match the job name, "build". https://doc.mergify.io/conditions.html#github-actions TODO: rename "build"->"lint" in lint.yml --- .mergify.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.mergify.yml b/.mergify.yml index e7c13d0..f2aad55 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,6 +2,7 @@ pull_request_rules: - name: Automatic merge on approval conditions: - label=automerge + - status-success=build - status-success=continuous-integration/travis-ci/pr - status-success=continuous-integration/travis-ci/push actions: