From 5b92286568ed98254a1d641c120c1e89cc6bcb92 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 12 Jan 2019 10:43:43 -0800
Subject: [PATCH] Remove channel duplication

---
 ci/channel-info.sh         | 26 +++++++++++++++++++++-----
 ci/publish-snap.sh         | 14 +++-----------
 ci/publish-tarball.sh      |  8 --------
 sdk/docker-solana/build.sh | 12 ++----------
 4 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/ci/channel-info.sh b/ci/channel-info.sh
index 690b8f510..f787ea393 100755
--- a/ci/channel-info.sh
+++ b/ci/channel-info.sh
@@ -82,10 +82,26 @@ for tag in "${tags[@]}"; do
   fi
 done
 
-echo EDGE_CHANNEL=master
-echo BETA_CHANNEL="${beta:+v$beta}"
-echo STABLE_CHANNEL="${stable:+v$stable}"
-echo BETA_CHANNEL_LATEST_TAG="${beta_tag:+v$beta_tag}"
-echo STABLE_CHANNEL_LATEST_TAG="${stable_tag:+v$stable_tag}"
+EDGE_CHANNEL=master
+BETA_CHANNEL=${beta:+v$beta}
+STABLE_CHANNEL=${stable:+v$stable}
+BETA_CHANNEL_LATEST_TAG=${beta_tag:+v$beta_tag}
+STABLE_CHANNEL_LATEST_TAG=${stable_tag:+v$stable_tag}
+
+
+if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
+  CHANNEL=stable
+elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
+  CHANNEL=edge
+elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
+  CHANNEL=beta
+fi
+
+echo EDGE_CHANNEL="$EDGE_CHANNEL"
+echo BETA_CHANNEL="$BETA_CHANNEL"
+echo BETA_CHANNEL_LATEST_TAG="$BETA_CHANNEL_LATEST_TAG"
+echo STABLE_CHANNEL="$STABLE_CHANNEL"
+echo STABLE_CHANNEL_LATEST_TAG="$STABLE_CHANNEL_LATEST_TAG"
+echo CHANNEL="$CHANNEL"
 
 exit 0
diff --git a/ci/publish-snap.sh b/ci/publish-snap.sh
index 2e1e35a26..98eb9fbdf 100755
--- a/ci/publish-snap.sh
+++ b/ci/publish-snap.sh
@@ -19,14 +19,6 @@ fi
 
 eval "$(ci/channel-info.sh)"
 
-if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
-  CHANNEL=stable
-elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
-  CHANNEL=edge
-elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
-  CHANNEL=beta
-fi
-
 if [[ -z $CHANNEL ]]; then
   echo Unable to determine channel to publish into, exiting.
   exit 1
@@ -61,13 +53,13 @@ if [[ ! -x /usr/bin/multilog ]]; then
   sudo apt-get install -y daemontools
 fi
 
-echo --- build: $CHANNEL channel
+echo "--- build: $CHANNEL channel"
 snapcraft
 
 source ci/upload-ci-artifact.sh
 upload-ci-artifact solana_*.snap
 
 if [[ -z $DO_NOT_PUBLISH_SNAP ]]; then
-  echo --- publish: $CHANNEL channel
-  $DRYRUN snapcraft push solana_*.snap --release $CHANNEL
+  echo "--- publish: $CHANNEL channel"
+  $DRYRUN snapcraft push solana_*.snap --release "$CHANNEL"
 fi
diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
index 125d3b1a1..cfbb50499 100755
--- a/ci/publish-tarball.sh
+++ b/ci/publish-tarball.sh
@@ -11,14 +11,6 @@ fi
 
 eval "$(ci/channel-info.sh)"
 
-if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
-  CHANNEL=stable
-elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
-  CHANNEL=edge
-elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
-  CHANNEL=beta
-fi
-
 if [[ -n "$BUILDKITE_TAG" ]]; then
   CHANNEL_OR_TAG=$BUILDKITE_TAG
 elif [[ -n "$TRIGGERED_BUILDKITE_TAG" ]]; then
diff --git a/sdk/docker-solana/build.sh b/sdk/docker-solana/build.sh
index 878d06b81..6f8adcc7a 100755
--- a/sdk/docker-solana/build.sh
+++ b/sdk/docker-solana/build.sh
@@ -4,14 +4,6 @@ set -ex
 cd "$(dirname "$0")"
 eval "$(../../ci/channel-info.sh)"
 
-if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
-  CHANNEL=stable
-elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
-  CHANNEL=edge
-elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
-  CHANNEL=beta
-fi
-
 if [[ -z $CHANNEL ]]; then
   echo Unable to determine channel to publish into, exiting.
   echo "^^^ +++"
@@ -24,7 +16,7 @@ rm -rf usr/
 
 cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
 
-docker build -t solanalabs/solana:$CHANNEL .
+docker build -t solanalabs/solana:"$CHANNEL" .
 
 maybeEcho=
 if [[ -z $CI ]]; then
@@ -38,4 +30,4 @@ else
     fi
   )
 fi
-$maybeEcho docker push solanalabs/solana:$CHANNEL
+$maybeEcho docker push solanalabs/solana:"$CHANNEL"