Skip to content
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

Jump to bottom

honor XTASK_BIN in tools/install_*_prerequisites.sh #5860

Merged
merged 1 commit into from
Jun 6, 2024
Merged

honor XTASK_BIN in tools/install_*_prerequisites.sh #5860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion tools/install_builder_prerequisites.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ function retry
exit $retry_rc
}

function xtask
{
if [ -z ${XTASK_BIN+x} ]; then
cargo xtask "$@"
else
"$XTASK_BIN" "$@"
fi
}

# Packages to be installed on all OSes:
#
# - libpq, the PostgreSQL client lib.
Expand Down Expand Up @@ -191,7 +200,7 @@ retry install_packages
# - Packaging: When constructing packages on Helios, these utilities
# are packaged into zones which may be launched by the sled agent.

retry cargo xtask download \
retry xtask download \
cockroach \
clickhouse \
console \
Expand Down
11 changes: 10 additions & 1 deletion tools/install_runner_prerequisites.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@ function retry
exit $retry_rc
}

function xtask
{
if [ -z ${XTASK_BIN+x} ]; then
cargo xtask "$@"
else
"$XTASK_BIN" "$@"
fi
}

# Packages to be installed Helios:
#
# - libpq, the PostgreSQL client lib.
Expand Down Expand Up @@ -154,7 +163,7 @@ if [[ "${HOST_OS}" == "SunOS" ]]; then
# Grab the SoftNPU machinery (ASIC simulator, scadm, P4 program, etc.)
#
# "cargo xtask virtual-hardware create" will use those to setup the softnpu zone
retry cargo xtask download softnpu
retry xtask download softnpu
fi

echo "All runner prerequisites installed successfully"
Loading