From 750101bd64a88eb6205afa4195d3448d223e423c Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Sat, 27 Jun 2026 16:49:04 -0700 Subject: [PATCH 1/2] Update Java and Rust Signed-off-by: Ryan Aslett --- orka/templates/macos-test.pkr.hcl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/orka/templates/macos-test.pkr.hcl b/orka/templates/macos-test.pkr.hcl index 49bbc1a48..7c6528cfe 100644 --- a/orka/templates/macos-test.pkr.hcl +++ b/orka/templates/macos-test.pkr.hcl @@ -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." } @@ -242,12 +242,12 @@ 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). From 619f38f98f66ee0035fe13b0ecc07c54006ff98e Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Mon, 29 Jun 2026 07:56:30 -0700 Subject: [PATCH 2/2] Packer: Update rust installation process Signed-off-by: Ryan Aslett --- orka/templates/macos-test.pkr.hcl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/orka/templates/macos-test.pkr.hcl b/orka/templates/macos-test.pkr.hcl index 7c6528cfe..7fdeb143d 100644 --- a/orka/templates/macos-test.pkr.hcl +++ b/orka/templates/macos-test.pkr.hcl @@ -254,12 +254,13 @@ build { 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",