Skip to content

chore: add more error messaging for bencher #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 22, 2025
Merged

chore: add more error messaging for bencher #383

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
feab6f0
add more error messaging
makspll Mar 22, 2025
e263411
fix
makspll Mar 22, 2025
afffe39
remove explicit directory
makspll Mar 22, 2025
907f1ab
log command
makspll Mar 22, 2025
67e8fcd
install bencher in init
makspll Mar 22, 2025
b2cf992
fix powershell script
makspll Mar 22, 2025
e260a56
change executable to pwsh
makspll Mar 22, 2025
d27a1d7
just install from source
makspll Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions crates/xtask/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,10 +1217,10 @@ impl Xtasks {
fn bench(app_settings: GlobalArgs) -> Result<()> {
// first of all figure out which branch we're on
// run // git rev-parse --abbrev-ref HEAD

let workspace_dir = Self::workspace_dir(&app_settings).unwrap();
let command = Command::new("git")
.args(["rev-parse", "--abbrev-ref", "HEAD"])
.current_dir(Self::workspace_dir(&app_settings).unwrap())
.current_dir(workspace_dir.clone())
.output()
.with_context(|| "Trying to figure out which branch we're on in benchmarking")?;
let branch = String::from_utf8(command.stdout)?;
Expand Down Expand Up @@ -1251,7 +1251,6 @@ impl Xtasks {
bencher_cmd
.stdout(std::process::Stdio::inherit())
.stderr(std::process::Stdio::inherit())
.current_dir(Self::workspace_dir(&app_settings).unwrap())
.arg("run")
.args(["--project", "bms"])
.args(["--branch", &format!("\"{branch}\"")])
Expand All @@ -1277,7 +1276,11 @@ impl Xtasks {
.args(["--adapter", "rust_criterion"])
.arg("cargo bench --features=lua54");

let out = bencher_cmd.output()?;
log::info!("Running bencher command: {:?}", bencher_cmd);

let out = bencher_cmd
.output()
.with_context(|| "Could not trigger bencher command")?;
if !out.status.success() {
bail!("Failed to run bencher: {:?}", out);
}
Expand Down Expand Up @@ -1495,6 +1498,25 @@ impl Xtasks {
)?;
}

// install bencher
// linux curl --proto '=https' --tlsv1.2 -sSfL https://bencher.dev/download/install-cli.sh | sh
// windows irm https://bencher.dev/download/install-cli.ps1 | iex
Self::run_system_command(
&app_settings,
"cargo",
"Failed to install bencher",
vec![
"install",
"--git",
"https://github.com/bencherdev/bencher",
"--branch",
"main",
"--locked",
"--force",
"bencher_cli",
],
None,
)?;
// install cargo mdbook
Self::run_system_command(
&app_settings,
Expand Down
Loading