From b0bcc8355fae4585b5fec2b13a24fb6bcf38008f Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 22 Jan 2019 14:16:29 -0800
Subject: [PATCH] User-initiated builds now select the correct channel

---
 ci/publish-metrics-dashboard.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/publish-metrics-dashboard.sh b/ci/publish-metrics-dashboard.sh
index 08be7382c3..3a13ff33f7 100755
--- a/ci/publish-metrics-dashboard.sh
+++ b/ci/publish-metrics-dashboard.sh
@@ -8,11 +8,11 @@ if [[ -z $BUILDKITE ]]; then
   exit 1
 fi
 
-if [[ -z $CHANNEL ]]; then
-  CHANNEL=$(buildkite-agent meta-data get "channel" --default "")
+if [[ -z $PUBLISH_CHANNEL ]]; then
+  PUBLISH_CHANNEL=$(buildkite-agent meta-data get "channel" --default "")
 fi
 
-if [[ -z $CHANNEL ]]; then
+if [[ -z $PUBLISH_CHANNEL ]]; then
   (
     cat <<EOF
 steps:
@@ -37,7 +37,7 @@ fi
 ci/channel-info.sh
 eval "$(ci/channel-info.sh)"
 
-case $CHANNEL in
+case $PUBLISH_CHANNEL in
 edge)
   CHANNEL_BRANCH=$EDGE_CHANNEL
   ;;
@@ -52,7 +52,7 @@ stable)
   fi
   ;;
 *)
-  echo "Error: Invalid CHANNEL=$CHANNEL"
+  echo "Error: Invalid PUBLISH_CHANNEL=$PUBLISH_CHANNEL"
   exit 1
   ;;
 esac
@@ -67,11 +67,11 @@ steps:
       message: "$BUILDKITE_MESSAGE"
       branch: "$CHANNEL_BRANCH"
       env:
-        CHANNEL: "$CHANNEL"
+        PUBLISH_CHANNEL: "$PUBLISH_CHANNEL"
 EOF
   ) | buildkite-agent pipeline upload
   exit 0
 fi
 
 set -x
-exec metrics/publish-metrics-dashboard.sh "$CHANNEL"
+exec metrics/publish-metrics-dashboard.sh "$PUBLISH_CHANNEL"