From 06cff1fb9f1113b24b1c32bc3d5090856816324e Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Thu, 2 Jan 2020 20:44:15 -0800
Subject: [PATCH] Publish bpf-sdk releases (#7655)

---
 ci/publish-bpf-sdk.sh      | 11 ++++++++---
 ci/publish-tarball.sh      | 10 ++++++++--
 sdk/bpf/scripts/package.sh |  2 ++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ci/publish-bpf-sdk.sh b/ci/publish-bpf-sdk.sh
index a80532066f..515eb69516 100755
--- a/ci/publish-bpf-sdk.sh
+++ b/ci/publish-bpf-sdk.sh
@@ -4,7 +4,12 @@ set -e
 cd "$(dirname "$0")/.."
 eval "$(ci/channel-info.sh)"
 
-echo --- Creating tarball
+if [[ -n "$CI_TAG" ]]; then
+  CHANNEL_OR_TAG=$CI_TAG
+else
+  CHANNEL_OR_TAG=$CHANNEL
+fi
+
 (
   set -x
   sdk/bpf/scripts/package.sh
@@ -12,7 +17,7 @@ echo --- Creating tarball
 )
 
 echo --- AWS S3 Store
-if [[ -z $CHANNEL ]]; then
+if [[ -z $CHANNEL_OR_TAG ]]; then
   echo Skipped
 else
   (
@@ -24,7 +29,7 @@ else
       --volume "$PWD:/solana" \
       eremite/aws-cli:2018.12.18 \
       /usr/bin/s3cmd --acl-public put /solana/bpf-sdk.tar.bz2 \
-      s3://solana-sdk/"$CHANNEL"/bpf-sdk.tar.bz2
+      s3://solana-sdk/"$CHANNEL_OR_TAG"/bpf-sdk.tar.bz2
   )
 fi
 
diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
index d267b03ddd..262bcc83fc 100755
--- a/ci/publish-tarball.sh
+++ b/ci/publish-tarball.sh
@@ -53,7 +53,7 @@ windows)
   ;;
 esac
 
-echo --- Creating tarball
+echo --- Creating release tarball
 (
   set -x
   rm -rf solana-release/
@@ -95,9 +95,15 @@ if [[ "$CI_OS_NAME" = linux ]]; then
   MAYBE_METRICS_TARBALL=solana-metrics.tar.bz2
 fi
 
+(
+  set -x
+  sdk/bpf/scripts/package.sh
+  [[ -f bpf-sdk.tar.bz2 ]]
+)
+
 source ci/upload-ci-artifact.sh
 
-for file in solana-release-$TARGET.tar.bz2 solana-release-$TARGET.yml solana-install-init-"$TARGET"* $MAYBE_METRICS_TARBALL; do
+for file in solana-release-$TARGET.tar.bz2 solana-release-$TARGET.yml solana-install-init-"$TARGET"* $MAYBE_METRICS_TARBALL bpf-sdk.tar.bz2; do
   upload-ci-artifact "$file"
 
   if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
diff --git a/sdk/bpf/scripts/package.sh b/sdk/bpf/scripts/package.sh
index f180069160..040ac1cb1e 100755
--- a/sdk/bpf/scripts/package.sh
+++ b/sdk/bpf/scripts/package.sh
@@ -3,6 +3,8 @@ set -ex
 
 cd "$(dirname "$0")"/../../..
 
+echo --- Creating bpf-sdk tarball
+
 rm -rf bpf-sdk.tar.bz2 bpf-sdk/
 mkdir bpf-sdk/
 cp LICENSE bpf-sdk/