-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
1 parent
14f75f9
commit e337562
Showing
3 changed files
with
8 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |