keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msrv: Bump to Rust 1.48.0

Browse Source 
We need this for https://cxx.rs

While we're here:

 - Add some more comments/links
 - Since the Rust bits are now at the toplevel, we can explicitly
   invoke `cargo`
 - And since we can do that, use the `+` syntax to specify the
   toolchain explicitly
This commit is contained in:
Colin Walters 2020-12-11 18:16:35 +00:00 committed by OpenShift Merge Robot
parent 3065554ba1
commit b3b4dd3d22
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cci.jenkinsfile
View File

@ -47,7 +47,6 @@ unit: {
checkout scm checkout scm
shwrap(""" shwrap("""
MAKE_JOBS=${n} CARGO_BUILD_JOBS=${n} ci/msrv.sh MAKE_JOBS=${n} CARGO_BUILD_JOBS=${n} ci/msrv.sh
PATH="\$HOME/.cargo/bin:\$PATH" make check
""") """)
} }
}} }}

12
ci/msrv.sh
View File

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
# this corresponds to the latest Rust module available in el8 # Usually, we try to keep this to no newer than current RHEL8 rust-toolset version.
MINIMUM_SUPPORTED_RUST_VERSION=1.45.2 # 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 ci/installdeps.sh
dnf remove -y cargo dnf remove -y cargo
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${MINIMUM_SUPPORTED_RUST_VERSION} -y curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${MINIMUM_SUPPORTED_RUST_VERSION} -y
export PATH="$HOME/.cargo/bin:$PATH" export PATH="$HOME/.cargo/bin:$PATH"
SKIP_INSTALLDEPS=1 ci/build.sh |& tee out.txt cargo +${MINIMUM_SUPPORTED_RUST_VERSION} test
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