Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ unit: {
checkout scm
shwrap("""
MAKE_JOBS=${n} CARGO_BUILD_JOBS=${n} ci/msrv.sh
PATH="\$HOME/.cargo/bin:\$PATH" make check
""")
}
}}
Expand Down
12 changes: 6 additions & 6 deletions ci/msrv.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash
set -euo pipefail

# this corresponds to the latest Rust module available in el8
MINIMUM_SUPPORTED_RUST_VERSION=1.45.2
# Usually, we try to keep this to no newer than current RHEL8 rust-toolset version.
# You can find the current versions from here:
# https://access.redhat.com/documentation/en-us/red_hat_developer_tools/1/
# However, right now we are bumping to 1.48 so we can use https://cxx.rs
MINIMUM_SUPPORTED_RUST_VERSION=1.48

ci/installdeps.sh
dnf remove -y cargo
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${MINIMUM_SUPPORTED_RUST_VERSION} -y
export PATH="$HOME/.cargo/bin:$PATH"
SKIP_INSTALLDEPS=1 ci/build.sh |& tee out.txt
grep ${MINIMUM_SUPPORTED_RUST_VERSION} out.txt
grep "checking for cargo... $HOME/.cargo/bin/cargo" out.txt
grep "checking for rustc... $HOME/.cargo/bin/rustc" out.txt
cargo +${MINIMUM_SUPPORTED_RUST_VERSION} test