From 755064d3e2589dca251312883c57b44acc8304d0 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 18 Dec 2018 08:14:33 -0800 Subject: [PATCH] Use |cargo +nightly| to avoid assuming nightly is default --- ci/test-bench.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/test-bench.sh b/ci/test-bench.sh index d845d31de6..39289c57e1 100755 --- a/ci/test-bench.sh +++ b/ci/test-bench.sh @@ -7,9 +7,6 @@ cd "$(dirname "$0")/.." source ci/upload-ci-artifact.sh eval "$(ci/channel-info.sh)" - -# This job doesn't run within a container, try once to upgrade tooling on a -# version check failure ci/version-check-with-upgrade.sh nightly _() { @@ -30,16 +27,19 @@ fi BENCH_FILE=bench_output.log BENCH_ARTIFACT=current_bench_results.log -_ cargo bench --features=unstable --verbose -- -Z unstable-options --format=json | tee "$BENCH_FILE" +_ cargo +nightly bench --features=unstable --verbose \ + -- -Z unstable-options --format=json | tee "$BENCH_FILE" # Run bpf_loader bench with bpf_c feature enabled +echo --- program/native/bpf_loader bench --features=bpf_c ( set -x - cd "programs/native/bpf_loader" - echo --- program/native/bpf_loader bench --features=bpf_c - cargo bench --verbose --features="bpf_c" -- -Z unstable-options --format=json --nocapture | tee -a ../../../"$BENCH_FILE" + cd programs/native/bpf_loader + cargo +nightly bench --verbose --features="bpf_c" \ + -- -Z unstable-options --format=json --nocapture | tee -a ../../../"$BENCH_FILE" ) -_ cargo run --release --package solana-upload-perf -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT" +_ cargo +nightly run --release --package solana-upload-perf \ + -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT" upload-ci-artifact "$BENCH_ARTIFACT"