From 05de260216997b5bb27b9073576897fb17b68f88 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Fri, 11 Sep 2020 15:11:19 -0600 Subject: [PATCH] CI: Don't overwrite pre-existing $CHANNEL --- ci/channel-info.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/channel-info.sh b/ci/channel-info.sh index 3f4dfc24b..270cc8c9e 100755 --- a/ci/channel-info.sh +++ b/ci/channel-info.sh @@ -95,12 +95,14 @@ elif [[ -n $CI_BRANCH ]]; then BRANCH="$CI_BRANCH" fi -if [[ $BRANCH = "$STABLE_CHANNEL" ]]; then - CHANNEL=stable -elif [[ $BRANCH = "$EDGE_CHANNEL" ]]; then - CHANNEL=edge -elif [[ $BRANCH = "$BETA_CHANNEL" ]]; then - CHANNEL=beta +if [[ -z "$CHANNEL" ]]; then + if [[ $BRANCH = "$STABLE_CHANNEL" ]]; then + CHANNEL=stable + elif [[ $BRANCH = "$EDGE_CHANNEL" ]]; then + CHANNEL=edge + elif [[ $BRANCH = "$BETA_CHANNEL" ]]; then + CHANNEL=beta + fi fi echo EDGE_CHANNEL="$EDGE_CHANNEL"