Skip to content

ci: pin a Rust nightly version #6513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gdesmott merged 1 commit into from
Aug 21, 2025
Merged

ci: pin a Rust nightly version #6513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .install/test_deps/common_installations.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ activate_venv() {
fi
}

# retrieve nightly version from build.sh
NIGHTLY_VERSION=$(grep "NIGHTLY_VERSION=" build.sh | cut -d'=' -f2 | tr -d '"')
# --allow-downgrade:
# Allow `rustup` to install an older `nightly` if the latest one
# is missing one of the components we need.
Expand All @@ -29,7 +31,7 @@ activate_venv() {
# Required to run `cargo miri test` for UB detection
# rust-src:
# Required to build RedisJSON with address sanitizer
rustup toolchain install nightly \
rustup toolchain install $NIGHTLY_VERSION \
--allow-downgrade \
--component llvm-tools-preview \
--component miri \
Expand All @@ -40,7 +42,7 @@ cargo install cargo-llvm-cov --locked
# Make sure `miri` is fully operational before running tests with it.
# See https://github.com/rust-lang/miri/blob/master/README.md#running-miri-on-ci
# for more details.
cargo +nightly miri setup
cargo +$NIGHTLY_VERSION miri setup

python3 -m venv venv
activate_venv
Expand Down
9 changes: 7 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,11 +552,16 @@ run_rust_tests() {
export RUSTFLAGS="${RUSTFLAGS:+${RUSTFLAGS} }-D warnings"
fi

# Pin a specific working version of nightly to prevent breaking the CI because
# regressions in a nightly build.
# Make sure to synchronize updates across all modules: Redis and RedisJSON.
NIGHTLY_VERSION="nightly-2025-07-30"

# Add Rust test extensions
if [[ $COV == 1 ]]; then
# We use the `nightly` compiler in order to include doc tests in the coverage computation.
# See https://github.com/taiki-e/cargo-llvm-cov/issues/2 for more details.
RUST_EXTENSIONS="+nightly llvm-cov"
RUST_EXTENSIONS="+$NIGHTLY_VERSION llvm-cov"
RUST_TEST_OPTIONS="
--doctests
--codecov
Expand All @@ -565,7 +570,7 @@ run_rust_tests() {
--output-path=$BINROOT/rust_cov.info
"
elif [[ -n "$SAN" || "$RUN_MIRI" == "1" ]]; then # using `elif` as we shouldn't run with both
RUST_EXTENSIONS="+nightly miri"
RUST_EXTENSIONS="+$NIGHTLY_VERSION miri"
fi

# Run cargo test with the appropriate filter
Expand Down
2 changes: 2 additions & 0 deletions tests/deps/setup_rejson.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ TEST_DEPS_DIR="${ROOT}/tests/deps"
JSON_MODULE_DIR="${TEST_DEPS_DIR}/RedisJSON"
JSON_BIN_DIR="${BINROOT}/RedisJSON/${JSON_BRANCH}"
export JSON_BIN_PATH="${JSON_BIN_DIR}/rejson.so"
# Instruct RedisJSON to use the same pinned nightly version as RediSearch
export RUST_GOOD_NIGHTLY=$(grep "NIGHTLY_VERSION=" ${ROOT}/build.sh | cut -d'=' -f2 | tr -d '"')

# Check if REJSON_PATH is set externally
if [ -n "$REJSON_PATH" ]; then
Expand Down