diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index 91057980..648d9b29 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -40,17 +40,9 @@ msrv: { coreos.pod(image: 'registry.svc.ci.openshift.org/coreos/cosa-buildroot:latest', runAsUser: 0) { checkout scm - // this corresponds to the latest Rust module available in el8 - def MINIMUM_SUPPORTED_RUST_VERSION = "1.31.0" - sh """ set -euo pipefail - ci/installdeps.sh - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${MINIMUM_SUPPORTED_RUST_VERSION} -y - PATH="\$HOME/.cargo/bin:\$PATH" 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 + ci/msrv.sh """ } }} diff --git a/.papr.yml b/.papr.yml index b593653a..54f8ccc8 100644 --- a/.papr.yml +++ b/.papr.yml @@ -132,15 +132,5 @@ required: true container: image: registry.fedoraproject.org/fedora:29 -env: - # this corresponds to the latest Rust module available in el8 - RUST_MIN_VERSION: 1.37.0 - tests: - - ci/installdeps.sh - - yum remove -y cargo - - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $RUST_MIN_VERSION -y - - PATH=$HOME/.cargo/bin:$PATH ci/build.sh |& tee out.txt - - grep $RUST_MIN_VERSION out.txt - - grep "checking for cargo... $HOME/.cargo/bin/cargo" out.txt - - grep "checking for rustc... $HOME/.cargo/bin/rustc" out.txt + - ci/msrv.sh diff --git a/ci/msrv.sh b/ci/msrv.sh new file mode 100755 index 00000000..c11103b3 --- /dev/null +++ b/ci/msrv.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -euo pipefail + +# this corresponds to the latest Rust module available in el8 +MINIMUM_SUPPORTED_RUST_VERSION=1.37.0 + +ci/installdeps.sh +dnf remove -y cargo +curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${MINIMUM_SUPPORTED_RUST_VERSION} -y +PATH="$HOME/.cargo/bin:$PATH" 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