Merge cdd9043 into 88febfa

zouyx · Dec 8, 2020 · 7cf7a39 · 7cf7a39
2 parents 88febfa + cdd9043
commit 7cf7a39
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 43 deletions.
diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml
@@ -1,6 +1,3 @@
 # Comment to a new issue.
 issueOpened: >
-  谢谢你提出的问题，我会在1-2日内进行查看或者回复，如果遇到节假日可能会处理较慢，敬请谅解。请确保你给了我们尽可能多的背景。
-
-pullRequestOpened: >
-  感谢您提出Pull Request，我会尽快Review。我会在1-2日内进行查看或者回复，如果遇到节假日可能会处理较慢，敬请谅解。
+  谢谢你提出的问题，我会在1-2日内进行查看或者回复，如果遇到节假日可能会处理较慢，敬请谅解。请确保你给了我们尽可能多的背景。
diff --git a/.github/workflows_bak/go.yml b/.github/workflows_bak/go.yml
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,32 @@
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: merge
+  - name: automatic merge on Travis CI success if some files are changed
+    conditions:
+      - check-success=Travis CI - Pull Request
+      - files~=^./
+    actions:
+      merge:
+        method: merge
+  - name: say hi on Pull Request
+    actions:
+      comment:
+        message: |
+          感谢您提出Pull Request，我会尽快Review。我会在1-2日内进行查看或者回复，如果遇到节假日可能会处理较慢，敬请谅解。
+  - name: ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: 这个 PR 发生了冲突. @{{author}} 是否能帮忙修复呢? 🙏
+  - name: ask to fix commit message
+    conditions:
+      - check-failure=Semantic Pull Request
+    actions:
+      comment:
+        message: |
+          这个 PR 发生了检查失败，@{{author}} 是否能帮忙修复呢？🙏