Skip to content

Commit 44550bd

Browse files
committed
chore(ci): improve cargo-install recipe
1 parent ca561f1 commit 44550bd

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

justfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ features_flag := '--all-features'
99
ci_mode := if env('CI', '') != '' {'1'} else {''}
1010
# cargo-binstall needs a workaround due to caching
1111
# ci_mode might be manually set by user, so re-check the env var
12-
binstall_args := if env('CI', '') != '' {'--no-track --disable-telemetry'} else {''}
12+
binstall_args := if env('CI', '') != '' {'--no-confirm --no-track --disable-telemetry'} else {''}
1313
export RUSTFLAGS := env('RUSTFLAGS', if ci_mode == '1' {'-D warnings'} else {''})
1414
export RUSTDOCFLAGS := env('RUSTDOCFLAGS', if ci_mode == '1' {'-D warnings'} else {''})
1515
export RUST_BACKTRACE := env('RUST_BACKTRACE', if ci_mode == '1' {'1'} else {''})
@@ -147,11 +147,14 @@ cargo-install $COMMAND $INSTALL_CMD='' *args='':
147147
#!/usr/bin/env bash
148148
set -euo pipefail
149149
if ! command -v $COMMAND > /dev/null; then
150+
echo "$COMMAND could not be found. Installing..."
150151
if ! command -v cargo-binstall > /dev/null; then
151-
echo "$COMMAND could not be found. Installing it with cargo install ${INSTALL_CMD:-$COMMAND} --locked {{args}}"
152+
set -x
152153
cargo install ${INSTALL_CMD:-$COMMAND} --locked {{args}}
154+
{ set +x; } 2>/dev/null
153155
else
154-
echo "$COMMAND could not be found. Installing it with cargo binstall ${INSTALL_CMD:-$COMMAND} {{binstall_args}} --locked {{args}}"
156+
set -x
155157
cargo binstall ${INSTALL_CMD:-$COMMAND} {{binstall_args}} --locked {{args}}
158+
{ set +x; } 2>/dev/null
156159
fi
157160
fi

0 commit comments

Comments
 (0)