Skip to content

Commit e812bbc

Browse files
erik-bershelerik-bershel
authored
[macOS] Introduce macOS-26 base code (#13007)
1 parent a4fd58c commit e812bbc

25 files changed

+751
-108
lines changed

‎.github/ISSUE_TEMPLATE/announcement.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ body:
4444
- label: macOS 14 Arm64
4545
- label: macOS 15
4646
- label: macOS 15 Arm64
47+
- label: macOS 26 Arm64
4748
- label: Windows Server 2019
4849
- label: Windows Server 2022
4950
- label: Windows Server 2025

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ body:
2727
- label: macOS 14 Arm64
2828
- label: macOS 15
2929
- label: macOS 15 Arm64
30+
- label: macOS 26 Arm64
3031
- label: Windows Server 2019
3132
- label: Windows Server 2022
3233
- label: Windows Server 2025

‎.github/ISSUE_TEMPLATE/tool-request.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ body:
6565
- label: macOS 14 Arm64
6666
- label: macOS 15
6767
- label: macOS 15 Arm64
68+
- label: macOS 26 Arm64
6869
- label: Windows Server 2019
6970
- label: Windows Server 2022
7071
- label: Windows Server 2025

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat
2222
| --------------------|---------------------|--------------------|
2323
| Ubuntu 24.04 | `ubuntu-latest` or `ubuntu-24.04` | [ubuntu-24.04] |
2424
| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] |
25+
| macOS 26 Arm64 `beta` | `macos-15` or `macos-26-xlarge` | [macOS-26-arm64] |
2526
| macOS 15 | `macos-latest-large` or `macos-15-large`| [macOS-15] |
2627
| macOS 15 Arm64 | `macos-latest`, `macos-15`, or `macos-15-xlarge` | [macOS-15-arm64] |
2728
| macOS 14 | `macos-14-large`| [macOS-14] |
@@ -48,6 +49,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat
4849
[macOS-14-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
4950
[macOS-15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
5051
[macOS-15-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
52+
[macOS-26-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
5153
[self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners
5254

5355
## Announcements

‎images/macos/macos-26-arm64-Readme.md‎

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
1+
# macOS 26
2+
- OS Version: macOS 26.0 (25A5351b)
3+
- Kernel Version: Darwin 25.0.0
4+
- Image Version: 20250910.90
5+
6+
## Installed Software
7+
8+
### Language and Runtime
9+
- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.414, 9.0.102, 9.0.203, 9.0.305
10+
- Bash 3.2.57(1)-release
11+
- Clang/LLVM 17.0.0
12+
- Clang/LLVM (Homebrew) 20.1.8 - available on `$(brew --prefix llvm@20)/bin/clang`
13+
- GCC 13 (Homebrew GCC 13.4.0) - available by `gcc-13` alias
14+
- GCC 14 (Homebrew GCC 14.3.0) - available by `gcc-14` alias
15+
- GCC 15 (Homebrew GCC 15.1.0) - available by `gcc-15` alias
16+
- GNU Fortran 13 (Homebrew GCC 13.4.0) - available by `gfortran-13` alias
17+
- GNU Fortran 14 (Homebrew GCC 14.3.0) - available by `gfortran-14` alias
18+
- GNU Fortran 15 (Homebrew GCC 15.1.0) - available by `gfortran-15` alias
19+
- Kotlin 2.2.20-release-333
20+
- Node.js 24.7.0
21+
- Perl 5.40.2
22+
- Python3 3.13.7
23+
- Ruby 3.4.5
24+
25+
### Package Management
26+
- Bundler 2.7.2
27+
- Carthage 0.40.0
28+
- CocoaPods 1.16.2
29+
- Homebrew 4.6.10
30+
- NPM 11.5.1
31+
- Pip3 25.2 (python 3.13)
32+
- Pipx 1.7.1
33+
- RubyGems 3.7.2
34+
- Vcpkg 2025 (build from commit 5ed7006439)
35+
- Yarn 1.22.22
36+
37+
### Project Management
38+
- Apache Ant 1.10.15
39+
- Apache Maven 3.9.11
40+
- Gradle 9.0.0
41+
42+
### Utilities
43+
- 7-Zip 17.05
44+
- aria2 1.37.0
45+
- azcopy 10.30.1
46+
- bazel 8.4.0
47+
- bazelisk 1.27.0
48+
- bsdtar 3.5.3 - available by 'tar' alias
49+
- Curl 8.7.1
50+
- Git 2.50.1
51+
- Git LFS 3.7.0
52+
- GitHub CLI 2.79.0
53+
- GNU Tar 1.35 - available by 'gtar' alias
54+
- GNU Wget 1.25.0
55+
- gpg (GnuPG) 2.4.8
56+
- jq 1.8.1
57+
- OpenSSL 3.5.2 5 Aug 2025 (Library: OpenSSL 3.5.2 5 Aug 2025)
58+
- Packer 1.14.2
59+
- pkgconf 2.5.1
60+
- Unxip 3.2
61+
- yq 4.47.2
62+
- zstd 1.5.7
63+
- Ninja 1.13.1
64+
65+
### Tools
66+
- AWS CLI 2.29.0
67+
- AWS SAM CLI 1.143.0
68+
- AWS Session Manager CLI 1.2.707.0
69+
- Azure CLI 2.77.0
70+
- Azure CLI (azure-devops) 1.0.2
71+
- Bicep CLI 0.37.4
72+
- Cmake 4.1.1
73+
- CodeQL Action Bundle 2.23.0
74+
- Fastlane 2.228.0
75+
- SwiftFormat 0.57.2
76+
- Xcbeautify 2.30.1
77+
- Xcode Command Line Tools 26.0.0.0.1.1755155385
78+
- Xcodes 1.6.2
79+
80+
### Browsers
81+
- Safari 26.0 (21622.1.22.11.14)
82+
- SafariDriver 26.0 (21622.1.22.11.14)
83+
- Google Chrome 140.0.7339.133
84+
- Google Chrome for Testing 140.0.7339.82
85+
- ChromeDriver 140.0.7339.82
86+
- Microsoft Edge 140.0.3485.54
87+
- Microsoft Edge WebDriver 140.0.3485.54
88+
- Mozilla Firefox 142.0.1
89+
- geckodriver 0.36.0
90+
- Selenium server 4.35.0
91+
92+
#### Environment variables
93+
| Name | Value |
94+
| --------------- | --------------------------------------- |
95+
| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-arm64 |
96+
| EDGEWEBDRIVER | /usr/local/share/edge_driver |
97+
| GECKOWEBDRIVER | /opt/homebrew/opt/geckodriver/bin |
98+
99+
### Java
100+
| Version | Environment Variable |
101+
| -------------------- | -------------------- |
102+
| 11.0.28+6 | JAVA_HOME_11_arm64 |
103+
| 17.0.16+8 | JAVA_HOME_17_arm64 |
104+
| 21.0.8+9.0 (default) | JAVA_HOME_21_arm64 |
105+
106+
### Cached Tools
107+
108+
#### Ruby
109+
- 3.2.9
110+
- 3.3.9
111+
- 3.4.5
112+
113+
#### Python
114+
- 3.11.9
115+
- 3.12.10
116+
- 3.13.7
117+
118+
#### Node.js
119+
- 20.19.5
120+
- 22.19.0
121+
- 24.7.0
122+
123+
#### Go
124+
- 1.23.12
125+
- 1.24.7
126+
- 1.25.1
127+
128+
### Rust Tools
129+
- Cargo 1.89.0
130+
- Rust 1.89.0
131+
- Rustdoc 1.89.0
132+
- Rustup 1.28.2
133+
134+
#### Packages
135+
- Clippy 0.1.89
136+
- Rustfmt 1.8.0-stable
137+
138+
### PowerShell Tools
139+
- PowerShell 7.4.11
140+
141+
#### PowerShell Modules
142+
- Az: 14.3.0
143+
- Pester: 5.7.1
144+
- PSScriptAnalyzer: 1.24.0
145+
146+
### Xcode
147+
| Version | Build | Path | Symlinks |
148+
| -------------- | ------ | -------------------------------------------- | ----------------------------------------------------------------------------------------- |
149+
| 26.0 (default) | 17A321 | /Applications/Xcode_26_Release_Candidate.app | /Applications/Xcode_26.0.0.app<br>/Applications/Xcode_26.0.app<br>/Applications/Xcode.app |
150+
| 16.4 | 16F6 | /Applications/Xcode_16.4.app | /Applications/Xcode_16.4.0.app |
151+
152+
#### Installed SDKs
153+
| SDK | SDK Name | Xcode Version |
154+
| ------------------------- | -------------------- | ------------- |
155+
| macOS 15.5 | macosx15.5 | 16.4 |
156+
| macOS 26.0 | macosx26.0 | 26.0 |
157+
| iOS 18.5 | iphoneos18.5 | 16.4 |
158+
| iOS 26.0 | iphoneos26.0 | 26.0 |
159+
| Simulator - iOS 18.5 | iphonesimulator18.5 | 16.4 |
160+
| Simulator - iOS 26.0 | iphonesimulator26.0 | 26.0 |
161+
| tvOS 18.5 | appletvos18.5 | 16.4 |
162+
| tvOS 26.0 | appletvos26.0 | 26.0 |
163+
| Simulator - tvOS 18.5 | appletvsimulator18.5 | 16.4 |
164+
| Simulator - tvOS 26.0 | appletvsimulator26.0 | 26.0 |
165+
| watchOS 11.5 | watchos11.5 | 16.4 |
166+
| watchOS 26.0 | watchos26.0 | 26.0 |
167+
| Simulator - watchOS 11.5 | watchsimulator11.5 | 16.4 |
168+
| Simulator - watchOS 26.0 | watchsimulator26.0 | 26.0 |
169+
| visionOS 2.5 | xros2.5 | 16.4 |
170+
| visionOS 26.0 | xros26.0 | 26.0 |
171+
| Simulator - visionOS 2.5 | xrsimulator2.5 | 16.4 |
172+
| Simulator - visionOS 26.0 | xrsimulator26.0 | 26.0 |
173+
| DriverKit 24.5 | driverkit24.5 | 16.4 |
174+
| DriverKit 25.0 | driverkit25.0 | 26.0 |
175+
176+
#### Installed Simulators
177+
| OS | Simulators |
178+
| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
179+
| iOS 18.5 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone 16e<br>iPad (A16)<br>iPad Air 11-inch (M3)<br>iPad Air 13-inch (M3)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) |
180+
| iOS 18.6 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone 16e<br>iPad (A16)<br>iPad Air 11-inch (M3)<br>iPad Air 13-inch (M3)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) |
181+
| iOS 26.0 | iPhone 16e<br>iPhone 17<br>iPhone 17 Pro<br>iPhone 17 Pro Max<br>iPhone Air<br>iPad (A16)<br>iPad Air 11-inch (M3)<br>iPad Air 13-inch (M3)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) |
182+
| tvOS 18.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) |
183+
| tvOS 26.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) |
184+
| watchOS 11.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) |
185+
| watchOS 26.0 | Apple Watch SE 3 (40mm)<br>Apple Watch SE 3 (44mm)<br>Apple Watch Series 11 (42mm)<br>Apple Watch Series 11 (46mm)<br>Apple Watch Ultra 3 (49mm) |
186+
| visionOS 2.5 | Apple Vision Pro |
187+
| visionOS 26.0 | Apple Vision Pro |
188+
189+
### Android
190+
| Package Name | Version |
191+
| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
192+
| Android Command Line Tools | 16.0 |
193+
| Android Emulator | 36.1.9 |
194+
| Android SDK Build-tools | 36.0.0<br>35.0.0 35.0.1 |
195+
| Android SDK Platforms | android-36-ext19 (rev 1)<br>android-36-ext18 (rev 1)<br>android-36 (rev 2)<br>android-35-ext15 (rev 1)<br>android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) |
196+
| Android SDK Platform-Tools | 36.0.0 |
197+
| Android Support Repository | 47.0.0 |
198+
| CMake | 3.31.5 |
199+
| Google Play services | 49 |
200+
| Google Repository | 58 |
201+
| NDK | 27.3.13750724 (default)<br>28.2.13676358 |
202+
203+
#### Environment variables
204+
| Name | Value |
205+
| ----------------------- | --------------------------------------------------- |
206+
| ANDROID_HOME | /Users/runner/Library/Android/sdk |
207+
| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/27.3.13750724 |
208+
| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/27.3.13750724 |
209+
| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/28.2.13676358 |
210+
| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.3.13750724 |
211+
| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk |

‎images/macos/scripts/build/configure-tccdb-macos.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ systemValuesArray=(
4848
"'kTCCServiceSystemPolicyNetworkVolumes','com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068"
4949
)
5050
for values in "${systemValuesArray[@]}"; do
51-
if is_Sonoma || is_Sequoia; then
52-
# TCC access table in Sonoma has extra 4 columns: pid, pid_version, boot_uuid, last_reminded
51+
if ! is_Ventura; then
52+
# TCC access table in Sonoma and later has extra 4 columns: pid, pid_version, boot_uuid, last_reminded
5353
configure_system_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}"
5454
else
5555
configure_system_tccdb "$values"
@@ -98,8 +98,8 @@ userValuesArray=(
9898
"'kTCCServiceUbiquity','com.apple.mail',0,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1551941469"
9999
)
100100
for values in "${userValuesArray[@]}"; do
101-
if is_Sonoma || is_Sequoia; then
102-
# TCC access table in Sonoma has extra 4 columns: pid, pid_version, boot_uuid, last_reminded
101+
if ! is_Ventura; then
102+
# TCC access table in Sonoma and later has extra 4 columns: pid, pid_version, boot_uuid, last_reminded
103103
configure_user_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}"
104104
else
105105
configure_user_tccdb "$values"

‎images/macos/scripts/build/install-common-utils.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ if is_SonomaX64 || is_VenturaX64 || is_SequoiaX64; then
6161
if is_SonomaX64; then
6262
osascript $HOME/utils/confirm-identified-developers-macos14.scpt $USER_PASSWORD
6363
fi
64+
6465
if is_SequoiaX64; then
6566
osascript $HOME/utils/confirm-identified-developers-macos15.scpt $USER_PASSWORD
6667
fi

‎images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions))
3737
$languageAndRuntime.AddNodes($(Get-GccVersions))
3838
$languageAndRuntime.AddNodes($(Get-FortranVersions))
3939
$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion))
40-
if ((-not $os.IsSequoia)) {
40+
if (($os.IsVentura -or $os.IsSonoma)) {
4141
$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion))
4242
}
4343
$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion))
4444
$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion))
45-
if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) {
45+
if ((-not $os.IsArm64)) {
4646
$languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion))
4747
}
4848
$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version))
@@ -53,12 +53,12 @@ $packageManagement = $installedSoftware.AddHeader("Package Management")
5353
$packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion))
5454
$packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion))
5555
$packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion))
56-
if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) {
56+
if ((-not $os.IsArm64)) {
5757
$packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion))
5858
}
5959
$packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion))
6060
$packageManagement.AddToolVersion("NPM", $(Get-NPMVersion))
61-
if ((-not $os.IsSequoia)) {
61+
if (($os.IsVentura -or $os.IsSonoma)) {
6262
$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion))
6363
}
6464
$packageManagement.AddToolVersion("Pip3", $(Get-Pip3Version))
@@ -116,8 +116,8 @@ $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVer
116116
$tools.AddToolVersion("Xcodes", $(Get-XcodesVersion))
117117

118118
# Linters
119-
$linters = $installedSoftware.AddHeader("Linters")
120-
if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) {
119+
if ((-not $os.IsArm64)) {
120+
$linters = $installedSoftware.AddHeader("Linters")
121121
$linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion))
122122
}
123123

@@ -174,15 +174,15 @@ $android.AddTable($androidTable)
174174
$androidEnv = $android.AddHeader("Environment variables")
175175
$androidEnv.AddTable($(Build-AndroidEnvironmentTable))
176176

177-
if ($os.IsSonoma -or $os.IsVentura -or $os.IsSequoiaX64) {
177+
if ($os.IsSonoma -or $os.IsVentura -or (-not $os.IsArm64)) {
178178
$miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
179179
}
180180

181181
if ($os.IsSonoma -or $os.IsVentura) {
182182
$miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion))
183183
}
184184

185-
if ($os.IsSonomaX64 -or $os.IsVenturaX64 -or $os.IsSequoiaX64) {
185+
if ((-not $os.IsArm64)) {
186186

187187
Write-Host "Adding environment variables for parallels"
188188

‎images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function Get-GeckodriverVersion {
7474

7575
function Get-SeleniumVersion {
7676
$os = Get-OSVersion
77-
if ($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) {
77+
if ($os.IsArm64) {
7878
$cellarPath = "/opt/homebrew/Cellar"
7979
} else {
8080
$cellarPath = "/usr/local/Cellar"

‎images/macos/scripts/docs-gen/SoftwareReport.Java.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ function Get-JavaVersions {
22
$defaultJavaPath = (Get-Item env:JAVA_HOME).value
33

44
$os = Get-OSVersion
5-
if ($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) {
5+
if ($os.IsArm64) {
66
$javaVersions = Get-Item env:JAVA_HOME_*_arm64
77
} else {
88
$javaVersions = Get-Item env:JAVA_HOME_*_X64

0 commit comments

Comments
 (0)