gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Overhaul cargo/rustc version management

Browse Source
This commit is contained in:
Michael Vines
2019-03-14 19:41:05 -07:00
parent 47ddbbe53b
commit 8f25548781
17 changed files with 96 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci/test-bench.sh
View File

@ -24,7 +24,7 @@ source ci/_
source ci/upload-ci-artifact.sh
eval "$(ci/channel-info.sh)"
ci/version-check-with-upgrade.sh nightly
source ci/rust-version.sh nightly
set -o pipefail
export RUST_BACKTRACE=1
@ -39,7 +39,7 @@ fi
BENCH_FILE=bench_output.log
BENCH_ARTIFACT=current_bench_results.log
_ cargo +nightly bench ${V:+--verbose} \
_ cargo +$rust_nightly bench ${V:+--verbose} \
-- -Z unstable-options --format=json | tee "$BENCH_FILE"
# Run bpf benches
@ -47,11 +47,11 @@ echo --- program/bpf
(
set -x
cd programs/bpf
cargo +nightly bench ${V:+--verbose} --features=bpf_c \
cargo +$rust_nightly bench ${V:+--verbose} --features=bpf_c \
-- -Z unstable-options --format=json --nocapture | tee -a ../../../"$BENCH_FILE"
)
_ cargo +nightly run --release --package solana-upload-perf \
_ cargo +$rust_nightly run --release --package solana-upload-perf \
-- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT"
upload-ci-artifact "$BENCH_ARTIFACT"