Skip to content

Commit 4788832

Browse files
committed
chore(ci): improve cargo-install recipe
1 parent 2e0dc5d commit 4788832

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 {''})
@@ -160,11 +160,14 @@ cargo-install $COMMAND $INSTALL_CMD='' *args='':
160160
#!/usr/bin/env bash
161161
set -euo pipefail
162162
if ! command -v $COMMAND > /dev/null; then
163+
echo "$COMMAND could not be found. Installing..."
163164
if ! command -v cargo-binstall > /dev/null; then
164-
echo "$COMMAND could not be found. Installing it with cargo install ${INSTALL_CMD:-$COMMAND} --locked {{args}}"
165+
set -x
165166
cargo install ${INSTALL_CMD:-$COMMAND} --locked {{args}}
167+
{ set +x; } 2>/dev/null
166168
else
167-
echo "$COMMAND could not be found. Installing it with cargo binstall ${INSTALL_CMD:-$COMMAND} {{binstall_args}} --locked {{args}}"
169+
set -x
168170
cargo binstall ${INSTALL_CMD:-$COMMAND} {{binstall_args}} --locked {{args}}
171+
{ set +x; } 2>/dev/null
169172
fi
170173
fi

0 commit comments

Comments
 (0)