From 23c6e581d3ac882c88428af15ca894373d0888b2 Mon Sep 17 00:00:00 2001
From: rafie <rafi@redislabs.com>
Date: Tue, 19 Jan 2021 16:25:31 +0200
Subject: [PATCH 1/4] CircleCI: support for intergration branches

---
 .circleci/config.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d98c3303a..59475bcb1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -345,17 +345,26 @@ on-version-tags: &on-version-tags
       only: /^v[0-9].*/
 
 on-master-and-version-tags: &on-master-and-version-tags
+  filters:
+    branches:
+      only: master
+    tags:
+      only: /^v[0-9].*/
+
+on-integ-and-version-tags: &on-integ-and-version-tags
   filters:
     branches:
       only:
         - master
+        - /^\d+\.\d+.*$/
     tags:
       only: /^v[0-9].*/
 
+
 platform-build-defs: &platform-build-defs
   requires:
     - build-debian
-  <<: *on-master-and-version-tags
+  <<: *on-integ-and-version-tags
   # <<: *on-any-branch # debugging
 
 after-platform-builds: &after-platform-builds
@@ -405,7 +414,7 @@ workflows:
           # <<: *on-version-tags
       - deploy-snapshot:
           <<: *after-platform-builds
-          <<: *on-master
+          <<: *on-integ-branch
       - deploy-release:
           <<: *after-platform-builds
           <<: *on-version-tags

From 8d294b6701be32cddf14006b9fb7b581cff809cd Mon Sep 17 00:00:00 2001
From: rafie <rafi@redislabs.com>
Date: Tue, 19 Jan 2021 16:59:00 +0200
Subject: [PATCH 2/4] fixes 1

---
 .circleci/config.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59475bcb1..a481fad6f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -337,6 +337,13 @@ on-master: &on-master
     branches:
       only: master
 
+on-integ-branch: &on-integ-branch
+  filters:
+    branches:
+      only:
+        - master
+        - /^\d+\.\d+.*$/
+
 on-version-tags: &on-version-tags
   filters:
     branches:

From 67c8abea9a7370ac292962c8e9faf7b2711a2bc2 Mon Sep 17 00:00:00 2001
From: rafie <rafi@redislabs.com>
Date: Tue, 19 Jan 2021 23:52:05 +0200
Subject: [PATCH 3/4] fixes 2

---
 .circleci/config.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a481fad6f..99c9ad3da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -336,6 +336,8 @@ on-master: &on-master
   filters:
     branches:
       only: master
+    tags:
+      ignore: /.*/
 
 on-integ-branch: &on-integ-branch
   filters:
@@ -343,6 +345,8 @@ on-integ-branch: &on-integ-branch
       only:
         - master
         - /^\d+\.\d+.*$/
+    tags:
+      ignore: /.*/
 
 on-version-tags: &on-version-tags
   filters:
@@ -351,13 +355,6 @@ on-version-tags: &on-version-tags
     tags:
       only: /^v[0-9].*/
 
-on-master-and-version-tags: &on-master-and-version-tags
-  filters:
-    branches:
-      only: master
-    tags:
-      only: /^v[0-9].*/
-
 on-integ-and-version-tags: &on-integ-and-version-tags
   filters:
     branches:

From 888379aca6e7079086cca85d80a7ef4ddbc9746b Mon Sep 17 00:00:00 2001
From: rafie <rafi@redislabs.com>
Date: Tue, 19 Jan 2021 23:55:21 +0200
Subject: [PATCH 4/4] fixes 3

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 99c9ad3da..8d43b8089 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -427,7 +427,9 @@ workflows:
     triggers:
       - schedule:
           cron: "20 17 * * *"
-          <<: *on-master
+          filters:
+            branches:
+              only: master
     jobs:
       - build-macos:
           <<: *never # temporarily disabled