diff --git a/scripts/check-quality-gate-prerequisites.sh b/scripts/check-quality-gate-prerequisites.sh index 8a750d2..4cd5c8c 100644 --- a/scripts/check-quality-gate-prerequisites.sh +++ b/scripts/check-quality-gate-prerequisites.sh @@ -13,7 +13,12 @@ done components=$(rustup component list --installed) for component in rustfmt clippy llvm-tools-preview; do - if ! grep -Eq "^${component}(-|$)" <<< "$components"; then + # rustup accepts llvm-tools-preview for installation but lists llvm-tools. + component_pattern="$component" + if [[ "$component" == llvm-tools-preview ]]; then + component_pattern='llvm-tools(-preview)?' + fi + if ! grep -Eq "^${component_pattern}(-|$)" <<< "$components"; then fail "Rust component $component" fi done