v0.12: Upload release tarball as a github release asset

.buildkite/env/secrets.ejson

@@ -1,10 +1,12 @@
 {
     "_public_key": "ae29f4f7ad2fc92de70d470e411c8426d5d48db8817c9e3dae574b122192335f",
     "environment": {
-      "CODECOV_TOKEN": "EJ[1:Kqnm+k1Z4p8nr7GqMczXnzh6azTk39tj3bAbCKPitUc=:EzVa4Gpj2Qn5OhZQlVfGFchuROgupvnW:CbWc6sNh1GCrAbrncxDjW00zUAD/Sa+ccg7CFSz8Ua6LnCYnSddTBxJWcJEbEs0MrjuZRQ==]",
-      "CRATES_IO_TOKEN": "EJ[1:Kqnm+k1Z4p8nr7GqMczXnzh6azTk39tj3bAbCKPitUc=:qF7QrUM8j+19mptcE1YS71CqmrCM13Ah:TZCatJeT1egCHiufE6cGFC1VsdJkKaaqV6QKWkEsMPBKvOAdaZbbVz9Kl+lGnIsF]",
-      "INFLUX_DATABASE": "EJ[1:Kqnm+k1Z4p8nr7GqMczXnzh6azTk39tj3bAbCKPitUc=:PetD/4c/EbkQmFEcK21g3cBBAPwFqHEw:wvYmDZRajy2WngVFs9AlwyHk]",
-      "INFLUX_USERNAME": "EJ[1:Kqnm+k1Z4p8nr7GqMczXnzh6azTk39tj3bAbCKPitUc=:WcnqZdmDFtJJ01Zu5LbeGgbYGfRzBdFc:a7c5zDDtCOu5L1Qd2NKkxT6kljyBcbck]",
-      "INFLUX_PASSWORD": "EJ[1:Kqnm+k1Z4p8nr7GqMczXnzh6azTk39tj3bAbCKPitUc=:LIZgP9Tp9yE9OlpV8iogmLOI7iW7SiU3:x0nYdT1A6sxu+O+MMLIN19d2t6rrK1qJ3+HnoWG3PDodsXjz06YJWQKU/mx6saqH+QbGtGV5mk0=]"
+      "CODECOV_TOKEN": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:rHBSqXK7uSnveA4qwUxARZjTNZcA0hXU:ko8lLGwPECpVm19znWBRxKEpMF7xpTHBCEzVOxRar2wDThw4lNDAKqTS61vtkJLtdkHtug==]",
+      "CRATES_IO_TOKEN": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:NzN6y0ooXJBYvxB589khepthSxhKFkLB:ZTTFZh2A/kB2SAgjJJAMbwAfanRlzxOCNMVcA2MXBCpQHJeeZGULg+0MLACYswfS]",
+      "GITHUB_TOKEN": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:iy0Fnxeo0aslTCvgXc5Ddj2ly6ZsQ8gK:GNOOj/kZUJ2rYKxTbLyVKtajWNoGQ3PcChwfEB4HdN18qDHlB96Z7gx01Pcf0qeIHODOWRtxlH4=]",
+      "INFLUX_DATABASE": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:Ly/TpIRF0oCxmiBWv225S3mX8s6pfQR+:+tXGB2c9rRCVDcgNO1IDOo89]",
+      "INFLUX_PASSWORD": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:ycrq1uQLoSfI932czD+krUOaJeLWpeq6:2iS7ukp/C7wVD3IT0GvQVcwccWGyLr4UocStF/XiDi0OB/N3YKIKN8SQU4ob1b6StAPZ/XOHmag=]",
+      "INFLUX_USERNAME": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:35hBKofakZ4Db/u0TOW53RXoNWzJTIcl:HWREcMTrgZ8DGB0ZupgSzNWr/tVyE06P]",
+      "SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:kRz8CyJYKAg/AiwgLrcRNDJAmlRX2zvX:uV1XV6y2Fb+dN4Z9BIMPBRiNS3n+NL8GlJXyu1i7meIsph1DzfLg4Thcp5Mj9nUsFNLgqQgjnsa5C4XNY/h5AgMSzRrJxVj7RhVTRmDJ5/Vjq6v7wCMRfBOvF3rITsV4zTwWSV8yafFmS+ZQ+QJTRgtYsuoYAUNZ06IEebfDHcuNwws72hEGoD9w43hOLSpyEOmXbtZ9h1lIRxrgsrhYDpBlU5LkhDeTXAX5M5dwYxyquJFRwd5quGDV5DYsCh9bAkbjAyjWYymVJ78U9YJIQHT9izzQqTDlMQN49EbLo7MDIaC7O7HVtb7unDJs+DRejbHacoyWVulqVVwu3GRiZezu8zdjwzGHphMMxOtKQaidnqYgflNp/O01I8wZRgR1alsGcmIhEhI8YV/IvQ==]"
     }
 }

ci/publish-tarball.sh

@@ -11,10 +11,13 @@ fi
 
 eval "$(ci/channel-info.sh)"
 
+TAG=
 if [[ -n "$BUILDKITE_TAG" ]]; then
   CHANNEL_OR_TAG=$BUILDKITE_TAG
+  TAG="$BUILDKITE_TAG"
 elif [[ -n "$TRIGGERED_BUILDKITE_TAG" ]]; then
   CHANNEL_OR_TAG=$TRIGGERED_BUILDKITE_TAG
+  TAG="$TRIGGERED_BUILDKITE_TAG"
 else
   CHANNEL_OR_TAG=$CHANNEL
 fi
@@ -24,16 +27,31 @@ if [[ -z $CHANNEL_OR_TAG ]]; then
   exit 1
 fi
 
+case "$(uname)" in
+Darwin)
+  TARGET=x86_64-apple-darwin
+  ;;
+Linux)
+  TARGET=x86_64-unknown-linux-gnu
+  ;;
+*)
+  TARGET=unknown-unknown-unknown
+  ;;
+esac
 
 echo --- Creating tarball
 (
   set -x
   rm -rf solana-release/
   mkdir solana-release/
+
+  COMMIT="$(git rev-parse HEAD)"
+
   (
-    echo "$CHANNEL_OR_TAG"
-    git rev-parse HEAD
-  ) > solana-release/version.txt
+    echo "channel: $CHANNEL"
+    echo "commit: $COMMIT"
+    echo "target: $TARGET"
+  ) > solana-release/version.yml
 
   source ci/rust-version.sh stable
   scripts/cargo-install-all.sh +"$rust_stable" solana-release
@@ -47,19 +65,21 @@ echo --- Creating tarball
   )
   cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda
 
-  tar jvcf solana-release.tar.bz2 solana-release/
+  tar jvcf solana-release-$TARGET.tar.bz2 solana-release/
+  cp solana-release/bin/solana-install solana-install-$TARGET
 )
 
 echo --- Saving build artifacts
 source ci/upload-ci-artifact.sh
-upload-ci-artifact solana-release.tar.bz2
+upload-ci-artifact solana-release-$TARGET.tar.bz2
 
 if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
   echo Skipped due to DO_NOT_PUBLISH_TAR
   exit 0
 fi
 
-echo --- AWS S3 Store
+file=solana-release-$TARGET.tar.bz2
+echo --- AWS S3 Store: $file
 (
   set -x
   $DRYRUN docker run \
@@ -68,11 +88,14 @@ echo --- AWS S3 Store
     --env AWS_SECRET_ACCESS_KEY \
     --volume "$PWD:/solana" \
     eremite/aws-cli:2018.12.18 \
-    /usr/bin/s3cmd --acl-public put /solana/solana-release.tar.bz2 \
-    s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
+    /usr/bin/s3cmd --acl-public put /solana/"$file" s3://solana-release/"$CHANNEL_OR_TAG"/"$file"
 
   echo Published to:
-  $DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
+  $DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/"$file"
 )
 
+if [[ -n $TAG ]]; then
+  ci/upload-github-release-asset.sh $file
+fi
+
 echo --- ok

ci/upload-github-release-asset.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+#
+# Uploads one or more files to a github release
+#
+# Prerequisites
+# 1) GITHUB_TOKEN defined in the environment
+# 2) TAG defined in the environment
+#
+set -e
+
+REPO_SLUG=solana-labs/solana
+
+if [[ -z $1 ]]; then
+  echo No files specified
+  exit 1
+fi
+
+if [[ -z $GITHUB_TOKEN ]]; then
+  echo Error: GITHUB_TOKEN not defined
+  exit 1
+fi
+
+if [[ -n $BUILDKITE_TAG ]]; then
+  TAG=$BUILDKITE_TAG
+elif [[ -n $TRIGGERED_BUILDKITE_TAG ]]; then
+  TAG=$TRIGGERED_BUILDKITE_TAG
+fi
+
+if [[ -z $TAG ]]; then
+  echo Error: TAG not defined
+  exit 1
+fi
+
+releaseId=$( \
+  curl -s "https://api.github.com/repos/$REPO_SLUG/releases/tags/$TAG" \
+  | grep -m 1 \"id\": \
+  | sed -ne 's/^[^0-9]*\([0-9]*\),$/\1/p' \
+)
+echo "Github release id for $TAG is $releaseId"
+
+for file in "$@"; do
+  echo "--- Uploading $file to tag $TAG of $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")"
+  echo
+done
+

multinode-demo/fullnode.sh

@@ -172,9 +172,8 @@ if [[ ! -d "$SOLANA_RSYNC_CONFIG_DIR"/ledger ]]; then
 fi
 
 if [[ ! -d "$ledger_config_dir" ]]; then
-  cp -ra "$SOLANA_RSYNC_CONFIG_DIR"/ledger "$ledger_config_dir"
+  cp -a "$SOLANA_RSYNC_CONFIG_DIR"/ledger/ "$ledger_config_dir"
   $solana_ledger_tool --ledger "$ledger_config_dir" verify
-
 fi
 
 trap 'kill "$pid" && wait "$pid"' INT TERM ERR

net/net.sh

@@ -278,15 +278,16 @@ start() {
       rm -f "$SOLANA_ROOT"/solana-release.tar.bz2
       (
         set -x
-        curl -o "$SOLANA_ROOT"/solana-release.tar.bz2 http://solana-release.s3.amazonaws.com/"$releaseChannel"/solana-release.tar.bz2
+        curl -o "$SOLANA_ROOT"/solana-release.tar.bz2 \
+          http://solana-release.s3.amazonaws.com/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2
       )
       tarballFilename="$SOLANA_ROOT"/solana-release.tar.bz2
     fi
     (
       set -x
       rm -rf "$SOLANA_ROOT"/solana-release
       (cd "$SOLANA_ROOT"; tar jxv) < "$tarballFilename"
-      cat "$SOLANA_ROOT"/solana-release/version.txt
+      cat "$SOLANA_ROOT"/solana-release/version.yml
     )
     ;;
   local)
@@ -371,7 +372,10 @@ start() {
   case $deployMethod in
   tar)
     networkVersion="$(
-      tail -n1 "$SOLANA_ROOT"/solana-release/version.txt || echo "tar-unknown"
+      (
+        set -o pipefail
+        grep "^version: " "$SOLANA_ROOT"/solana-release/version.yml | head -n1 | cut -d\  -f2
+      ) || echo "tar-unknown"
     )"
     ;;
   local)