From e3375626d54b832a7f4813c0bc9fc42fbe4f64e4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 29 Jan 2021 17:54:07 +0000
Subject: [PATCH] ci: Drop custom msrv checking

The way this tries to replace the system Rust is hacky and
actually I realized belatedly I may have broken it recently; basically
`installdeps.sh` re-adds the system one, and it's hard to be sure
with our current buildsystem we're using the newer one from `$PATH`.

What we really want to do here is use a CentOS8 buildroot,
which will automatically enforce this in a better way along
with solving other problems.  But right now we've broken
that because libdnf requires a too-new libmodulemd.

So let's just rely on the Fedora rust for now.
---
 .cci.jenkinsfile |  3 +--
 Cargo.toml       |  6 ++++++
 ci/unit.sh       | 10 +---------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 95cfda83..c90dc13e 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 ad7fe16c..2973322c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,12 @@ name = "rpmostree-rust"
 version = "0.1.0"
 authors = ["Colin Walters <walters@verbum.org>", "Jonathan Lebon <jonathan@jlebon.com>"]
 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 e1be68c5..cd9af714 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