milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

ci: Remove TOOLCHAIN env var 

Cargo already has an env var for controlling the toolchain, we should
use it instead of our current custom `TOOLCHAIn`.

While we are at it fix the missing `$` from variables (found by
`shellcheck`).

Use RUSTUP_TOOLCHAIN to allow control of the toolchain.
This commit is contained in:
Tobin C. Harding 2022-09-01 11:52:03 +10:00
parent 8eb6c23eaf
commit 37cd6503f1
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/test.sh
View File

@ -4,12 +4,6 @@ set -ex
FEATURES="base64 bitcoinconsensus serde rand secp-recovery" FEATURES="base64 bitcoinconsensus serde rand secp-recovery"
# Use toolchain if explicitly specified
if [ -n "$TOOLCHAIN" ]
then
alias cargo="cargo +$TOOLCHAIN"
fi
if [ "$DO_COV" = true ] if [ "$DO_COV" = true ]
then then
export RUSTFLAGS="-C link-dead-code" export RUSTFLAGS="-C link-dead-code"
@ -104,11 +98,11 @@ fi
# Bench if told to, only works with non-stable toolchain (nightly, beta). # Bench if told to, only works with non-stable toolchain (nightly, beta).
if [ "$DO_BENCH" = true ] if [ "$DO_BENCH" = true ]
then then
if [ "NIGHTLY" = false ] if [ "$NIGHTLY" = false ]
then then
if [ -n "TOOLCHAIN" ] if [ -n "$RUSTUP_TOOLCHAIN" ]
then then
echo "TOOLCHAIN is set to a non-nightly toolchain but DO_BENCH requires a nightly toolchain" echo "RUSTUP_TOOLCHAIN is set to a non-nightly toolchain but DO_BENCH requires a nightly toolchain"
else else
echo "DO_BENCH requires a nightly toolchain" echo "DO_BENCH requires a nightly toolchain"
fi fi