From f4e92fe50d13eca05b250ecdd65b7d0531f83fcc Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Thu, 4 Feb 2021 12:55:28 -0700 Subject: [PATCH] Keep tokio consistent with solana-program-test (#1157) * Keep tokio consistent with solana-program-test * Update update-solana-dependencies.sh Co-authored-by: Michael Vines Co-authored-by: Michael Vines --- patch.crates-io.sh | 4 ++-- update-solana-dependencies.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/patch.crates-io.sh b/patch.crates-io.sh index f3c97b7f..e46b5704 100755 --- a/patch.crates-io.sh +++ b/patch.crates-io.sh @@ -26,6 +26,7 @@ cd "$(dirname "$0")" source "$solana_dir"/scripts/read-cargo-variable.sh solana_ver=$(readCargoVariable version "$solana_dir"/sdk/Cargo.toml) +tokio_ver=$(sed -n "s#^tokio.*version *= *\"\([^\"]*\).*#\1#p" "$solana_dir"/program-test/Cargo.toml) echo "Patching in $solana_ver from $solana_dir" echo @@ -56,5 +57,4 @@ PATCH fi done -./update-solana-dependencies.sh "$solana_ver" - +./update-solana-dependencies.sh "$solana_ver" "$tokio_ver" diff --git a/update-solana-dependencies.sh b/update-solana-dependencies.sh index 3989d716..a0b1dd85 100755 --- a/update-solana-dependencies.sh +++ b/update-solana-dependencies.sh @@ -4,6 +4,7 @@ # solana_ver=$1 +tokio_ver=$2 if [[ -z $solana_ver ]]; then echo "Usage: $0 " exit 1 @@ -36,4 +37,6 @@ set -x for crate in "${crates[@]}"; do sed -i -e "s#\(${crate} = \"\).*\(\"\)#\1$solana_ver\2#g" "${tomls[@]}" done - +if [[ -n $tokio_ver ]]; then + sed -i -e "s#\(tokio.*version *= *\"\)[^\"]*\(\".*$\)#\1$tokio_ver\2#g" "${tomls[@]}" +fi