Skip to content

[pull] main from actions:main #259

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

Merged
pull merged 2 commits into from
May 20, 2026
Merged

[pull] main from actions:main #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22bbcc9
Close Setup Assistant window in configure-windows.sh (#14122)
nsakaimbo May 20, 2026
f51d790
[MacOS] Update Rust installation script to pin rustup formula (#14124)
v-sergei-pyshnoi May 20, 2026
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
15 changes: 15 additions & 0 deletions images/macos/scripts/build/configure-windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@ source ~/utils/utils.sh
if is_Arm64; then
echo "Close System Preferences window"
osascript -e 'tell application "System Preferences" to quit'

# Close Setup Assistant window which can auto-launch on first boot of arm64 macOS 15.
if pgrep -x "Setup Assistant" >/dev/null 2>&1; then
echo "Setup Assistant detected; attempting graceful quit"
osascript -e 'tell application "Setup Assistant" to quit' 2>/dev/null || true
sleep 1
if pgrep -x "Setup Assistant" >/dev/null 2>&1; then
echo "Setup Assistant still running; force-killing"
pkill -x "Setup Assistant" 2>/dev/null || true
else
echo "Setup Assistant exited gracefully"
fi
else
echo "Setup Assistant not running; no action needed"
fi
fi

retry=10
Expand Down
8 changes: 7 additions & 1 deletion images/macos/scripts/build/install-rust.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
source ~/utils/utils.sh

echo "Installing Rustup..."
brew_smart_install "rustup-init"
## Pin rustup due to https://github.com/actions/runner-images/issues/14097
COMMIT=cfffe64fa6fc4d56b3b2299ce07f224191098b6a
FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/r/rustup.rb"
FORMULA_PATH="$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/r/rustup.rb"
mkdir -p "$(dirname $FORMULA_PATH)"
curl -fsSL $FORMULA_URL -o $FORMULA_PATH
HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install rustup

echo "Installing Rust language..."
rustup-init -y --no-modify-path --default-toolchain=stable --profile=minimal
Expand Down
7 changes: 6 additions & 1 deletion images/ubuntu/toolsets/toolset-2204-arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,12 @@
"version": "14"
},
"cmake": {
"version": "3.31.6"
"version": "3.31.6",
"pinnedDetails": {
"reason": "Pinned to avoid CMake 4.0 compatibility issues",
"link": "https://github.com/actions/runner-images/issues/11926",
"review-at": "2026-09-01"
}
},
"pwsh": {
"version": "7.4"
Expand Down
7 changes: 6 additions & 1 deletion images/ubuntu/toolsets/toolset-2204.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,12 @@
"version": "14"
},
"cmake": {
"version": "3.31.6"
"version": "3.31.6",
"pinnedDetails": {
"reason": "Pinned to avoid CMake 4.0 compatibility issues",
"link": "https://github.com/actions/runner-images/issues/11926",
"review-at": "2026-09-01"
}
},
"pwsh": {
"version": "7.4"
Expand Down
7 changes: 6 additions & 1 deletion images/ubuntu/toolsets/toolset-2404-arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,12 @@
"version": "16"
},
"cmake": {
"version": "3.31.6"
"version": "3.31.6",
"pinnedDetails": {
"reason": "Pinned to avoid CMake 4.0 compatibility issues",
"link": "https://github.com/actions/runner-images/issues/11926",
"review-at": "2026-09-01"
}
},
"pwsh": {
"version": "7.4"
Expand Down
7 changes: 6 additions & 1 deletion images/ubuntu/toolsets/toolset-2404.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,12 @@
"version": "16"
},
"cmake": {
"version": "3.31.6"
"version": "3.31.6",
"pinnedDetails": {
"reason": "Pinned to avoid CMake 4.0 compatibility issues",
"link": "https://github.com/actions/runner-images/issues/11926",
"review-at": "2026-09-01"
}
},
"pwsh": {
"version": "7.4"
Expand Down
7 changes: 6 additions & 1 deletion images/windows/toolsets/toolset-win-11-arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,12 @@
"version": "3.10"
},
"llvm": {
"version": "20.1.6"
"version": "20.1.6",
"pinnedDetails": {
"reason": "Pinned to a specific version for Windows 11 ARM64 initial image support",
"link": "https://github.com/actions/runner-images/pull/13879",
"review-at": "2026-09-01"
}
},
"php": {
"version": "8.4"
Expand Down
7 changes: 6 additions & 1 deletion images/windows/toolsets/toolset-win-11-vs2026-arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,12 @@
"version": "3.10"
},
"llvm": {
"version": "20.1.6"
"version": "20.1.6",
"pinnedDetails": {
"reason": "Pinned to a specific version for Windows 11 ARM64 initial image support",
"link": "https://github.com/actions/runner-images/pull/13879",
"review-at": "2026-09-01"
}
},
"php": {
"version": "8.4"
Expand Down
Loading