diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh index 81099c724c..8678744eff 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 source ci/rust-version.sh stable scripts/cargo-install-all.sh +"$rust_stable" solana-release diff --git a/net/net.sh b/net/net.sh index b62c58027a..2b783e284e 100755 --- a/net/net.sh +++ b/net/net.sh @@ -286,7 +286,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) @@ -371,7 +371,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)