From 4b1de02bbb8ca645be08206c6ce7e86809133c39 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 20 Sep 2019 11:37:25 -0700 Subject: [PATCH] solana-validator-cuda wrapper is now net.sh compatible --- ci/publish-tarball.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh index 1fb48d9f5..37a3ac300 100755 --- a/ci/publish-tarball.sh +++ b/ci/publish-tarball.sh @@ -80,21 +80,23 @@ echo --- Creating tarball if [[ -n $maybeCUDA ]]; then # Wrap `solana-validator-cuda` with a script that loads perf-libs - # automatically + # automatically if possible cp -a target/perf-libs solana-release/target/ - mkdir solana-release/.bin - cp solana-release-cuda/bin/solana-validator solana-release/.bin/solana-validator-cuda + mkdir solana-release/bin/_ + cp solana-release-cuda/bin/solana-validator solana-release/bin/_/solana-validator-cuda cat > solana-release/bin/solana-validator-cuda <<'EOF' #!/usr/bin/env bash set -e cd "$(dirname "$0")"/.. -source target/perf-libs/env.sh +if [[ -f target/perf-libs/env.sh ]]; then + source target/perf-libs/env.sh +fi if [[ -z $SOLANA_PERF_LIBS_CUDA ]]; then echo - echo Error: CUDA not available + echo Error: SOLANA_PERF_LIBS_CUDA environment variable undefined exit 1 fi -exec .bin/solana-validator-cuda "$@" +exec _/solana-validator-cuda "$@" EOF chmod +x solana-release/bin/solana-validator-cuda fi