summaryrefslogtreecommitdiff
path: root/.github/configs
diff options
context:
space:
mode:
authorJack2022-01-12 04:27:19 +0000
committerJack2022-01-12 04:27:19 +0000
commit29df513e348cc809876893f650af8180f0190496 (patch)
tree06daaea954b4e5af7113f06e4bdbb78b33515cb3 /.github/configs
parent5242ce90659decb9058ee75db56e5c188029fbf9 (diff)
parent747d16311bdf185d2e98e452b14cb5d8ccca004c (diff)
Merge branch 'master' into 3.5-release
Diffstat (limited to '.github/configs')
-rw-r--r--.github/configs/mergify_config.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.github/configs/mergify_config.yml b/.github/configs/mergify_config.yml
new file mode 100644
index 00000000..dbed4fe8
--- /dev/null
+++ b/.github/configs/mergify_config.yml
@@ -0,0 +1,7 @@
+# Configuration for generating .mergify.yml
+conditions:
+ - status-success=all tests passed
+branches:
+ - 3.2.x
+ - 3.3.x
+ - 3.4.x