From 9538c7c4679a4e52d7c594a950ec43ac349ed6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Moy=C3=A1?= <federicomoyamartin@gmail.com>
Date: Tue, 10 Aug 2021 15:44:52 -0300
Subject: [PATCH 1/2] Do not run relase-images on forked prs

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e6162f2..2ad6b14a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,6 +29,10 @@ workflows:
       - release_images:
           requires:
             - build_and_test
+          filters:
+            branches:
+              # Forked pull requests have CIRCLE_BRANCH set to pull/XXX
+              ignore: /pull\/[0-9]+/
 notify:
   webhooks:
     - url: https://cc-slack-proxy.herokuapp.com/circle

From b4dec483f3447a76238e3b4d61fa41dc492e6a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Moy=C3=A1?= <federicomoyamartin@gmail.com>
Date: Fri, 20 Aug 2021 11:15:11 -0300
Subject: [PATCH 2/2] Remove deploy script and modify ci release filters to run
 only on master and channel branches

---
 .circleci/config.yml |  5 ++---
 bin/deploy           | 15 ---------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100755 bin/deploy

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2ad6b14a..c6c64abe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,7 @@ jobs:
       - setup_remote_docker:
           docker_layer_caching: true
       - run: docker login -u _json_key -p "$GCR_JSON_KEY" us.gcr.io
-      - run: bin/deploy
+      - run: make release RELEASE_TAG="b$CIRCLE_BUILD_NUM"
 
 workflows:
   version: 2
@@ -31,8 +31,7 @@ workflows:
             - build_and_test
           filters:
             branches:
-              # Forked pull requests have CIRCLE_BRANCH set to pull/XXX
-              ignore: /pull\/[0-9]+/
+              only: /master|channel\/[\w-]+/
 notify:
   webhooks:
     - url: https://cc-slack-proxy.herokuapp.com/circle
diff --git a/bin/deploy b/bin/deploy
deleted file mode 100755
index ea7601f2..00000000
--- a/bin/deploy
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$CIRCLE_BRANCH" in
-  master)
-    make release \
-     RELEASE_TAG="b$CIRCLE_BUILD_NUM"
-    ;;
-  *)
-    if [[ "$CIRCLE_BRANCH" =~ ^channel/[\w-]+ ]]; then
-      make release \
-        RELEASE_TAG="b$CIRCLE_BUILD_NUM"
-    fi
-    ;;
-esac