diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index 95cfda830f..c90dc13e7e 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -39,8 +39,7 @@ codestyle: { } }, unit: { - // this branch runs unit tests (both Rust-based and C-based) and makes sure we compile - // fine against the MSRV + // this branch runs unit tests (both Rust-based and C-based) def n = 5 cosaPod(buildroot: true, runAsUser: 0, memory: "2Gi", cpu: "${n}") { checkout scm diff --git a/Cargo.toml b/Cargo.toml index ad7fe16cf3..2973322c6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,12 @@ name = "rpmostree-rust" version = "0.1.0" authors = ["Colin Walters ", "Jonathan Lebon "] edition = "2018" +# See https://rust-lang.github.io/rfcs/2495-min-rust-version.html +# 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 +#rust = "1.48" links = "rpmostreeinternals" # This currently needs to duplicate the libraries in configure.ac diff --git a/ci/unit.sh b/ci/unit.sh index e1be68c553..cd9af714f2 100755 --- a/ci/unit.sh +++ b/ci/unit.sh @@ -1,15 +1,7 @@ #!/bin/bash set -euo pipefail -# 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 rust -curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${MINIMUM_SUPPORTED_RUST_VERSION} -y +ci/install-extra-builddeps.sh export PATH="$HOME/.cargo/bin:$PATH" ci/build.sh -cargo +${MINIMUM_SUPPORTED_RUST_VERSION} test