ci: Also bump MSRV to 1.37.0 for CCI Jenkins
Just split it out into a separate script for easier sharing.
This commit is contained in:
parent
8b6cfd6f23
commit
677c3c8b29
@ -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
|
||||
"""
|
||||
}
|
||||
}}
|
||||
|
12
.papr.yml
12
.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
|
||||
|
13
ci/msrv.sh
Executable file
13
ci/msrv.sh
Executable file
@ -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
|
Loading…
Reference in New Issue
Block a user