Skip to content

Commit b8046e2

Browse files
committed
[scripts] fix: update condition for Nix installation check;
[bbdev] fix: multithread kill bug
1 parent 2e2e7d9 commit b8046e2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

bbdev

scripts/nix/build-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ begin_step "0-2" "Nix environment setup"
8181
cd ${BBDIR}
8282
nix build
8383

84-
if [ "${INSTALL_IN_NIX}" = "0" ]; then
84+
if [ "${INSTALL_IN_NIX}" != "1" ]; then
8585
SKIP_ARGS=""
8686
for skip in "${SKIP_LIST[@]}"; do
8787
SKIP_ARGS="${SKIP_ARGS} -s ${skip}"
@@ -99,7 +99,7 @@ if run_step "1"; then
9999

100100
echo "Installing bbdev node dependencies..."
101101
cd ${BBDIR}/bbdev/api
102-
pnpm install --ignore-scripts --frozen-lockfile 2>/dev/null || pnpm install --ignore-scripts
102+
pnpm install --ignore-scripts --frozen-lockfile 2>/dev/null
103103
fi
104104

105105
if run_step "2"; then

0 commit comments

Comments
 (0)