From 1ddb492ea3a5d5a817d8782dac229169adbc1153 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Wed, 12 Jan 2022 08:11:18 -0800
Subject: Update master for 1.5.0 release (#2455)

* Enable CI for 1.5.x branch
* Enable Mergify for 1.5.x branch
* Drop 1.2.x from Mergify---
 .github/configs/mergify_config.yml | 2 +-
 .github/workflows/test.yml         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to '.github')

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
-- 
cgit v1.2.3