Merge 2b9905d into 42f8125

.mergify.yml

@@ -0,0 +1,44 @@
+pull_request_rules:
+  - name: remove outdated reviews
+    conditions:
+      - base=master
+    actions:
+      dismiss_reviews: {}
+  - name: automatic squash-merge when CI passes
+    conditions:
+      - base=master
+      - "#approved-reviews-by>=1"
+      - status-success=Travis CI - Pull Request
+      - label=ready-to-merge:squash
+      - label!=work-in-progress
+    actions:
+      merge:
+        method: squash
+  - name: automatic rebase-merge when CI passes
+    conditions:
+      - base=master
+      - "#approved-reviews-by>=1"
+      - status-success=Travis CI - Pull Request
+      - label=ready-to-merge:rebase
+      - label!=work-in-progress
+    actions:
+      merge:
+        method: rebase
+  - name: automatic merge when CI passes
+    conditions:
+      - base=master
+      - "#approved-reviews-by>=1"
+      - status-success=Travis CI - Pull Request
+      - label=ready-to-merge:merge
+      - label!=work-in-progress
+    actions:
+      merge:
+        method: merge
+  - name: automatically approve PR when pushed by me
+    conditions:
+      - author=tkf
+      - base=master
+      - status-success=Travis CI - Pull Request
+      - label~=ready-to-merge:.*
+    actions:
+      review: {}

.travis.yml

@@ -16,8 +16,10 @@ matrix:
 notifications:
   email: false
 
-# Do not build my PR twice.  Use the build on branch.
-if: NOT (type == pull_request AND head_repo == tkf/Kaleido.jl)
+# Only build branches via PR to avoid running CI twice.
+# https://docs.travis-ci.com/user/conditional-builds-stages-jobs
+# https://docs.travis-ci.com/user/conditions-v1
+if: branch = master OR tag IS present OR type != push
 
 before_install:
   - unset JULIA_PROJECT