From 28a9926ba189ad0a9a9e984b701d34c094977b36 Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Thu, 25 Feb 2021 14:57:40 -0700
Subject: [PATCH] Log devbuild branch and commit for locally built testnet
 (#15541)

---
 net/net.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/net/net.sh b/net/net.sh
index d547d950d..8b3a9bec2 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -193,6 +193,22 @@ build() {
       scripts/cargo-install-all.sh farf \"$buildVariant\"
     "
   )
+
+  (
+    set +e
+    COMMIT="$(git rev-parse HEAD)"
+    BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+    TAG="$(git describe --exact-match --tags HEAD 2>/dev/null)"
+    if [[ $TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+      NOTE=$TAG
+    else
+      NOTE=$BRANCH
+    fi
+    (
+      echo "channel: devbuild $NOTE"
+      echo "commit: $COMMIT"
+    ) > "$SOLANA_ROOT"/farf/version.yml
+  )
   echo "Build took $SECONDS seconds"
 }
 
@@ -247,7 +263,7 @@ deployBootstrapValidator() {
     ;;
   local)
     rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/farf/bin/* "$ipAddress:$CARGO_BIN/"
-    ssh "${sshOptions[@]}" -n "$ipAddress" "rm -f ~/version.yml; touch ~/version.yml"
+    rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/farf/version.yml "$ipAddress:~/"
     ;;
   skip)
     ;;