From 1115b69bf79e15bff1921fe29262bc9ddb029064 Mon Sep 17 00:00:00 2001
From: moto <855818+mthrok@users.noreply.github.com>
Date: Tue, 20 Oct 2020 17:55:41 +0000
Subject: [PATCH] Hard code UPLOAD_CHANNEL for release branch

---
 .circleci/config.yml    | 8 ++------
 .circleci/config.yml.in | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 12921612d98..ac229fa9433 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,12 +39,8 @@ commands:
       - run:
           name: adding UPLOAD_CHANNEL to BASH_ENV
           command: |
-            our_upload_channel=nightly
-            # On tags upload to test instead
-            if [[ -n "${CIRCLE_TAG}" ]]; then
-              our_upload_channel=test
-            fi
-            echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
+            # hard code channel for release so that PRs work on test channell
+            echo "export UPLOAD_CHANNEL=test" >> ${BASH_ENV}
 
 binary_common: &binary_common
   parameters:
diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
index e086da7d1b8..3b9c2a22376 100644
--- a/.circleci/config.yml.in
+++ b/.circleci/config.yml.in
@@ -39,12 +39,8 @@ commands:
       - run:
           name: adding UPLOAD_CHANNEL to BASH_ENV
           command: |
-            our_upload_channel=nightly
-            # On tags upload to test instead
-            if [[ -n "${CIRCLE_TAG}" ]]; then
-              our_upload_channel=test
-            fi
-            echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
+            # hard code channel for release so that PRs work on test channell
+            echo "export UPLOAD_CHANNEL=test" >> ${BASH_ENV}
 
 binary_common: &binary_common
   parameters: