fix: detect cargo-cross executable
Rust CI Cargo tests, coverage, or badge generation failed.
Gitea/rust_realease/pipeline/head There was a failure building this commit Details

This commit is contained in:
Dandaedre 2026-10-05 10:56:29 +02:00
parent e321a8798b
commit edb0bf7a21
2 changed files with 35 additions and 4 deletions

View File

@ -45,13 +45,15 @@ pub fn prerequisites(
}
for tool in ["git", "cargo"]
.into_iter()
.chain(needs_cross.then_some("cross"))
.chain(needs_binstall.then_some("cargo-binstall"))
{
if executable(tool).is_none() {
problems.push(format!("{tool} is missing"));
}
}
if needs_cross && cross_program().is_none() {
problems.push("cross is missing (looked for cross and cargo-cross)".into());
}
let mut engine = None;
if needs_cross {
let requested = env::var("CROSS_CONTAINER_ENGINE").ok();
@ -84,11 +86,26 @@ pub fn prerequisites(
fn executable(name: &str) -> Option<PathBuf> {
let path = env::var_os("PATH")?;
env::split_paths(&path)
executable_in(name, &path)
}
fn executable_in(name: &str, path: &std::ffi::OsStr) -> Option<PathBuf> {
env::split_paths(path)
.map(|dir| dir.join(name))
.find(|path| path.is_file())
}
fn cross_program() -> Option<&'static str> {
let path = env::var_os("PATH")?;
cross_program_in(&path)
}
fn cross_program_in(path: &std::ffi::OsStr) -> Option<&'static str> {
["cross", "cargo-cross"]
.into_iter()
.find(|name| executable_in(name, path).is_some())
}
fn validate_cross_config(root: &Path) -> Result<(), Error> {
let source = fs::read_to_string(root.join("Cargo.toml"))
.map_err(|e| Error(format!("cannot inspect root Cargo.toml: {e}")))?;
@ -239,6 +256,8 @@ pub fn build(
&config.profile
};
let mut outputs = Vec::new();
let cross = cross_program()
.ok_or_else(|| Error("cross is missing (looked for cross and cargo-cross)".into()))?;
let builds_started = Instant::now();
for target in &config.targets {
println!("Building {target}");
@ -249,7 +268,7 @@ pub fn build(
let target_build_dir = target_dir.join(target);
let args = cross_arguments(project, config, target, &target_build_dir);
let borrowed: Vec<&str> = args.iter().map(String::as_str).collect();
runner.output_with("cross", &borrowed, root, &environment, &[])?;
runner.output_with(cross, &borrowed, root, &environment, &[])?;
let mut binaries = Vec::new();
for name in &project.binaries {
let binary = target_build_dir
@ -377,6 +396,18 @@ fn short_commit(commit: &str) -> &str {
mod tests {
use super::*;
#[test]
fn cross_command_falls_back_to_cargo_cross() {
let temp = tempfile::tempdir().unwrap();
let path = env::join_paths([temp.path()]).unwrap();
fs::write(temp.path().join("cargo-cross"), "").unwrap();
assert_eq!(cross_program_in(&path), Some("cargo-cross"));
fs::write(temp.path().join("cross"), "").unwrap();
assert_eq!(cross_program_in(&path), Some("cross"));
}
fn test_project(target_directory: PathBuf) -> SelectedPackage {
SelectedPackage {
name: "cli".into(),

View File

@ -88,7 +88,7 @@ fn compile_only_reuses_clean_commit_and_rebuilds_changed_or_forced_inputs() {
executable(&fake_bin.join("docker"), "#!/bin/sh\n[ \"$1\" = info ]\n");
executable(&fake_bin.join("cargo-binstall"), "#!/bin/sh\nexit 0\n");
executable(
&fake_bin.join("cross"),
&fake_bin.join("cargo-cross"),
"#!/bin/sh\n\
set -eu\n\
target=\n\