diff --git a/.solstice/job.sh b/.solstice/job.sh index 4f8bc94..2f85b29 100755 --- a/.solstice/job.sh +++ b/.solstice/job.sh @@ -51,7 +51,7 @@ install_illumos() { if command -v pkg >/dev/null 2>&1; then # OpenIndiana IPS packages (best-effort) sudo pkg refresh || true - sudo pkg install -v developer/build/gnu-make developer/gcc-13 git developer/protobuf || true + sudo pkg install -v developer/build/gnu-make developer/gcc-13 git developer/protobuf developer/rustc || true elif command -v pkgin >/dev/null 2>&1; then sudo pkgin -y install git gcc gmake protobuf || true else @@ -61,6 +61,13 @@ install_illumos() { ensure_rust() { if command -v cargo >/dev/null 2>&1; then return 0; fi + OS=$(uname -s 2>/dev/null || echo unknown) + if [ "$OS" = "SunOS" ] && command -v pkg >/dev/null 2>&1; then + log "installing Rust toolchain via IPS package manager (developer/rustc)" + sudo pkg refresh || true + sudo pkg install -v developer/rustc || true + if command -v cargo >/dev/null 2>&1; then return 0; fi + fi log "installing Rust toolchain with rustup" curl -fsSL https://sh.rustup.rs | sh -s -- -y # shellcheck disable=SC1091