Skip to content

fix(system): Propagate command error when zig cannot be installed. #837

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
calavera merged 2 commits into from
Apr 2, 2025
Merged

fix(system): Propagate command error when zig cannot be installed. #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f8c1bc
fix(system): Propagate command error when zig cannot be installed.
calavera Apr 1, 2025
e5c91cf
chore(build): Update gh actions to upgrade the version of cmake.
calavera Apr 2, 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
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,15 @@ jobs:

- uses: korandoru/setup-zig@v1
with:
zig-version: 0.11.0
zig-version: 0.14.0

- name: Configure cache
uses: mozilla-actions/[email protected]

- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.31.x'

- name: Run cargo test
run: cargo test --all-features
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ jobs:
uses: dtolnay/rust-toolchain@stable
- name: Configure cache
uses: mozilla-actions/[email protected]
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.31.x'

- name: Build
uses: messense/maturin-action@v1
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/cargo-lambda-cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ fn error_hook(color: Option<&Color>) -> ErrorHook {
Box::new(move |_| {
Box::new(miette::MietteHandlerOpts::new()
.terminal_links(true)
.footer("Was this error unexpected?\nOpen an issue in https://github.com/cargo-lambda/cargo-lambda/issues".into())
.footer("Was this behavior unexpected?\nStart a thread in https://github.com/cargo-lambda/cargo-lambda/discussions".into())
.color(ansi)
.build())
})
Expand Down
1 change: 1 addition & 0 deletions crates/cargo-lambda-interactive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ inquire = "0.5.2"
is-terminal = "0.4.0"
miette.workspace = true
tokio = { workspace = true, features = ["process"] }
tracing.workspace = true
6 changes: 4 additions & 2 deletions crates/cargo-lambda-interactive/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ pub async fn silent_command(cmd: &str, args: &[&str]) -> Result<(), CommandError
return Err(capture_error(cmd, args, Some(&mut child), None).await);
};

tracing::trace!(%result);

if result.success() {
Ok(())
} else {
Expand Down Expand Up @@ -90,11 +92,11 @@ impl std::fmt::Display for CommandError {
}

if !self.stdout.is_empty() {
write!(f, "\nSTDOUT:\n{}", String::from_utf8_lossy(&self.stdout))?;
write!(f, "\n{}", String::from_utf8_lossy(&self.stdout))?;
}

if !self.stderr.is_empty() {
write!(f, "\nSTDERR:\n{}", String::from_utf8_lossy(&self.stderr))?;
write!(f, "\n{}", String::from_utf8_lossy(&self.stderr))?;
}

Ok(())
Expand Down
6 changes: 2 additions & 4 deletions crates/cargo-lambda-system/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@ pub async fn run(config: &System, options: &ConfigOptions) -> Result<()> {
trace!("running config command");

if config.setup {
let zig_info = check_installation().await;
if let Ok(zig_info) = zig_info {
return print_config(config.output_format.as_ref(), zig_info);
}
let zig_info = check_installation().await?;
return print_config(config.output_format.as_ref(), zig_info);
}

let mut info = Info {
Expand Down