aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/configs/mergify_config.yml2
-rw-r--r--.github/workflows/test.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/configs/mergify_config.yml b/.github/configs/mergify_config.yml
index 90bf4ad5..6ffd32d4 100644
--- a/.github/configs/mergify_config.yml
+++ b/.github/configs/mergify_config.yml
@@ -2,6 +2,6 @@
conditions:
- status-success=all tests passed
branches:
- - 1.2.x
- 1.3.x
- 1.4.x
+ - 1.5.x
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d50137ce..85e5bde6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,6 +5,7 @@ on:
push:
branches:
- master
+ - 1.5.x
- 1.4.x
- 1.3.x
- 1.2.x