From bd633d2b8155e8630c832895ea99392b9b01c242 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 17 Jun 2019 20:42:09 -0700
Subject: [PATCH] Add CI_REPO_SLUG (#4714)

automerge
---
 ci/env.sh                         |  4 ++++
 ci/upload-github-release-asset.sh | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ci/env.sh b/ci/env.sh
index 0ca4765f7..329089d88 100644
--- a/ci/env.sh
+++ b/ci/env.sh
@@ -17,6 +17,7 @@ if [[ -n $CI ]]; then
       export CI_PULL_REQUEST=
     fi
     export CI_OS_NAME=$TRAVIS_OS_NAME
+    export CI_REPO_SLUG=$TRAVIS_REPO_SLUG
     export CI_TAG=$TRAVIS_TAG
   elif [[ -n $BUILDKITE ]]; then
     export CI_BRANCH=$BUILDKITE_BRANCH
@@ -32,6 +33,7 @@ if [[ -n $CI ]]; then
       export CI_PULL_REQUEST=
     fi
     export CI_OS_NAME=linux
+    export CI_REPO_SLUG=$BUILDKITE_ORGANIZATION_SLUG/$BUILDKITE_PIPELINE_SLUG
     # TRIGGERED_BUILDKITE_TAG is a workaround to propagate BUILDKITE_TAG into
     # the solana-secondary builder
     if [[ -n $TRIGGERED_BUILDKITE_TAG ]]; then
@@ -54,6 +56,7 @@ if [[ -n $CI ]]; then
     elif [[ $CI_WINDOWS = True ]]; then
       export CI_OS_NAME=windows
     fi
+    export CI_REPO_SLUG=$APPVEYOR_REPO_NAME
     export CI_TAG=$APPVEYOR_REPO_TAG_NAME
   fi
 else
@@ -64,6 +67,7 @@ else
   export CI_JOB_ID=
   export CI_OS_NAME=
   export CI_PULL_REQUEST=
+  export CI_REPO_SLUG=
   export CI_TAG=
 fi
 
diff --git a/ci/upload-github-release-asset.sh b/ci/upload-github-release-asset.sh
index eb6ebe3c9..ebc4c56c3 100755
--- a/ci/upload-github-release-asset.sh
+++ b/ci/upload-github-release-asset.sh
@@ -8,8 +8,6 @@
 #
 set -e
 
-REPO_SLUG=solana-labs/solana
-
 if [[ -z $1 ]]; then
   echo No files specified
   exit 1
@@ -25,20 +23,25 @@ if [[ -z $CI_TAG ]]; then
   exit 1
 fi
 
+if [[ -z $CI_REPO_SLUG ]]; then
+  echo Error: CI_REPO_SLUG not defined
+  exit 1
+fi
+
 releaseId=$( \
-  curl -s "https://api.github.com/repos/$REPO_SLUG/releases/tags/$CI_TAG" \
+  curl -s "https://api.github.com/repos/$CI_REPO_SLUG/releases/tags/$CI_TAG" \
   | grep -m 1 \"id\": \
   | sed -ne 's/^[^0-9]*\([0-9]*\),$/\1/p' \
 )
 echo "Github release id for $CI_TAG is $releaseId"
 
 for file in "$@"; do
-  echo "--- Uploading $file to tag $CI_TAG of $REPO_SLUG"
+  echo "--- Uploading $file to tag $CI_TAG of $CI_REPO_SLUG"
   curl \
     --data-binary @"$file" \
     -H "Authorization: token $GITHUB_TOKEN" \
     -H "Content-Type: application/octet-stream" \
-    "https://uploads.github.com/repos/$REPO_SLUG/releases/$releaseId/assets?name=$(basename "$file")"
+    "https://uploads.github.com/repos/$CI_REPO_SLUG/releases/$releaseId/assets?name=$(basename "$file")"
   echo
 done