blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix snap build

This commit is contained in:
Michael Vines 2018-11-26 17:54:40 -08:00 committed by Grimes
parent 1695803248
commit 03ce45d93a
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ci/snap.sh
View File

@ -3,12 +3,9 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
if ! ci/version-check.sh stable; then # This job doesn't run within a container, try once to upgrade tooling on a
# This job doesn't run within a container, try once to upgrade tooling on a # version check failure
# version check failure ci/version-check-with-upgrade.sh stable
rustup install stable
ci/version-check.sh stable
fi
DRYRUN= DRYRUN=
if [[ -z $BUILDKITE_BRANCH ]]; then if [[ -z $BUILDKITE_BRANCH ]]; then

10
ci/test-bench.sh
View File

@ -8,13 +8,9 @@ source ci/upload_ci_artifact.sh
eval "$(ci/channel-info.sh)" eval "$(ci/channel-info.sh)"
if ! ci/version-check.sh nightly; then # This job doesn't run within a container, try once to upgrade tooling on a
# This job doesn't run within a container, try once to upgrade tooling on a # version check failure
# version check failure ci/version-check-with-upgrade.sh nightly
rustup install nightly
rustup default nightly
ci/version-check.sh nightly
fi
_() { _() {
echo "--- $*" echo "--- $*"

10
ci/test-large-network.sh
View File

@ -4,12 +4,10 @@ set -e
here=$(dirname "$0") here=$(dirname "$0")
cd "$here"/.. cd "$here"/..
if ! ci/version-check.sh stable; then # This job doesn't run within a container, try once to upgrade tooling on a
# This job doesn't run within a container, try once to upgrade tooling on a # version check failure
# version check failure ci/version-check-with-upgrade.sh stable
rustup install stable
ci/version-check.sh stable
fi
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
./fetch-perf-libs.sh ./fetch-perf-libs.sh

12
ci/test-stable-perf.sh
View File

@ -6,13 +6,9 @@ cd "$(dirname "$0")/.."
# Clear cached json keypair files # Clear cached json keypair files
rm -rf "$HOME/.config/solana" rm -rf "$HOME/.config/solana"
if ! ci/version-check.sh stable; then # This job doesn't run within a container, try once to upgrade tooling on a
# This job doesn't run within a container, try once to upgrade tooling on a # version check failure
# version check failure ci/version-check-with-upgrade.sh stable
rustup install stable
rustup default stable
ci/version-check.sh stable
fi
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
export RUSTFLAGS="-D warnings" export RUSTFLAGS="-D warnings"
@ -51,4 +47,4 @@ echo --- ci/localnet-sanity.sh
# Assume |cargo build| has populated target/debug/ successfully. # Assume |cargo build| has populated target/debug/ successfully.
export PATH=$PWD/target/debug:$PATH export PATH=$PWD/target/debug:$PATH
USE_INSTALL=1 ci/localnet-sanity.sh USE_INSTALL=1 ci/localnet-sanity.sh
) )

11
ci/version-check-with-upgrade.sh Executable file
View File

@ -0,0 +1,11 @@
#!/usr/bin/env bash
set -e
cd "$(dirname "$0")"
channel=${1:-stable}
if ! ./version-check.sh "$channel"; then
rustup install "$channel"
rustup default "$channel"
./version-check.sh "$channel"
fi