From 34a8d591fa614e41078a5fe026c9b9d85f8256ee Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 13 Mar 2019 16:11:50 -0700
Subject: [PATCH] Switch version file from .txt to .yaml; add target tuple to
 version.yml

---
 ci/publish-tarball.sh | 21 ++++++++++++++++++---
 net/net.sh            |  7 +++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
index cfbb50499..f607edce8 100755
--- a/ci/publish-tarball.sh
+++ b/ci/publish-tarball.sh
@@ -30,10 +30,25 @@ echo --- Creating tarball
   set -x
   rm -rf solana-release/
   mkdir solana-release/
+
+  case "$(uname)" in
+  Darwin)
+    TARGET=x86_64-apple-darwin
+    ;;
+  Linux)
+    TARGET=x86_64-unknown-linux-gnu
+    ;;
+  *)
+    TARGET=unknown-unknown-unknown
+    ;;
+  esac
+  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
 
   scripts/cargo-install-all.sh solana-release
 
diff --git a/net/net.sh b/net/net.sh
index f372f739a..89fc2ffad 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -285,7 +285,7 @@ start() {
       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)
@@ -370,7 +370,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)