Skip to content
Open
Changes from all commits
Commits
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
19 changes: 10 additions & 9 deletions orka/templates/macos-test.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ variable "xcode_version" {

variable "rust_version" {
type = string
default = "1.82"
default = "1.88"
description = "Rust toolchain version to install via rustup. Matches RUSTC_VERSION in nodejs/node test-macos.yml."
}

Expand Down Expand Up @@ -242,24 +242,25 @@ build {
"${local.homebrew_path}/bin/pipx ensurepath"
]
}
// Install Java 17 for Jenkins.
// Install Java 25 for Jenkins.
provisioner "shell" {
inline = [
"echo 'Installing JRE...'",
"eval \"$(${local.homebrew_path}/bin/brew shellenv)\"",
"${local.homebrew_path}/bin/brew install --cask temurin@17",
"${local.homebrew_path}/bin/brew install --cask temurin@25",
]
}
// Install Rust via rustup (matches nodejs/node test-macos.yml RUSTC_VERSION).
provisioner "shell" {
environment_vars = ["HOME=/Users/admin", "USER=admin"]
inline = [
"echo 'Installing rustup...'",
"eval \"$(${local.homebrew_path}/bin/brew shellenv)\"",
"${local.homebrew_path}/bin/brew install rustup",
"echo 'Installing Rust ${var.rust_version} toolchain...'",
"rustup-init -y --no-modify-path --default-toolchain ${var.rust_version} --profile minimal",
"rustup target add x86_64-apple-darwin",
"echo 'Installing Rust ${var.rust_version} via rustup installer...'",
"curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain ${var.rust_version} --profile minimal",
// On arm64: adds the Intel cross-compile target (arm builds x86 binaries).
// On x64: x86_64-apple-darwin is the host target already installed by the
// toolchain installer, so this is a harmless no-op. Do not make this
// architecture-conditional — the unconditional form is intentionally correct.
"/Users/admin/.cargo/bin/rustup target add x86_64-apple-darwin",
"echo 'export PATH=\"/Users/admin/.cargo/bin:$PATH\"' >> /Users/admin/.zprofile",
"/Users/admin/.cargo/bin/rustup --version",
"/Users/admin/.cargo/bin/rustc --version",
Expand Down
Loading