Skip to content

Commit fa402be

Browse files
authored
Pin indexmap to 1.8.2 for MSRV compile tasks (#684)
1 parent 60e57fa commit fa402be

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.evergreen/MSRV-Cargo.lock

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/compile-only.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ set -o errexit
55
source ./.evergreen/configure-rust.sh
66
rustup update $RUST_VERSION
77

8+
# pin dependencies who have bumped their MSRVs to > ours in recent releases.
9+
if [ "$MSRV" = "true" ]; then
10+
cp .evergreen/MSRV-Cargo.lock Cargo.lock
11+
fi
12+
813
if [ "$ASYNC_RUNTIME" = "tokio" ]; then
914
FEATURE_FLAGS=snappy-compression,zlib-compression
1015

@@ -17,12 +22,6 @@ if [ "$ASYNC_RUNTIME" = "tokio" ]; then
1722
rustup run $RUST_VERSION cargo build --features tokio-sync,$FEATURE_FLAGS
1823

1924
elif [ "$ASYNC_RUNTIME" = "async-std" ]; then
20-
# v2.1 of async-global-executor bumped its MSRV to 1.59, so we need a Cargo.lock
21-
# pinning to v2.0 to build with our MSRV.
22-
if [ "$MSRV" = "true" ]; then
23-
cp .evergreen/MSRV-Cargo.lock Cargo.lock
24-
fi
25-
2625
rustup run $RUST_VERSION cargo build --no-default-features --features async-std-runtime
2726
rustup run $RUST_VERSION cargo build --no-default-features --features sync
2827
else

0 commit comments

Comments
 (0)