Skip to content

Commit eaafd7c

Browse files
agockeericstjmatouskozak
authored
Move default build images to macos 15 (and xcode 16) (#120589)
Co-authored-by: Eric StJohn <[email protected]> Co-authored-by: Matous Kozak <[email protected]>
1 parent fbe7c39 commit eaafd7c

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

eng/pipelines/common/xplat-setup.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ jobs:
160160
container: ${{ parameters.container }}
161161

162162
${{ if eq(parameters.jobParameters.pool, '') }}:
163+
# N.B.: We should always be building on the latest available version of our build platform.
164+
# Each of these queues should be the latest version or have a tracking issue if the latest version
165+
# does not work for some reason.
163166
pool:
164167
# Public Linux Build Pool
165168
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}:
@@ -174,7 +177,7 @@ jobs:
174177

175178
# OSX Public Build Pool (we don't have on-prem OSX BuildPool).
176179
${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
177-
vmImage: 'macos-13'
180+
vmImage: 'macos-15'
178181

179182
# Official build OSX pool
180183
${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:

eng/pipelines/runtime.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,18 +1041,19 @@ extends:
10411041
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
10421042
eq(variables['isRollingBuild'], true))
10431043
# extra steps, run tests
1044-
postBuildSteps:
1045-
- template: /eng/pipelines/libraries/helix.yml
1046-
parameters:
1047-
creator: dotnet-bot
1048-
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
1049-
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
1050-
condition: >-
1051-
or(
1052-
eq(variables['librariesContainsChange'], true),
1053-
eq(variables['monoContainsChange'], true),
1054-
eq(variables['illinkContainsChange'], true),
1055-
eq(variables['isRollingBuild'], true))
1044+
# Disable tests on ios/tvos - mono - https://github.com/dotnet/runtime/issues/121967
1045+
# postBuildSteps:
1046+
# - template: /eng/pipelines/libraries/helix.yml
1047+
# parameters:
1048+
# creator: dotnet-bot
1049+
# testRunNamePrefixSuffix: Mono_$(_BuildConfig)
1050+
# extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
1051+
# condition: >-
1052+
# or(
1053+
# eq(variables['librariesContainsChange'], true),
1054+
# eq(variables['monoContainsChange'], true),
1055+
# eq(variables['illinkContainsChange'], true),
1056+
# eq(variables['isRollingBuild'], true))
10561057

10571058
#
10581059
# Build the whole product using CoreCLR and run functional tests

src/tests/issues.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,6 +2240,15 @@
22402240
<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'llvmfullaot' and '$(TargetArchitecture)' == 'x64'">
22412241
</ItemGroup>
22422242

2243+
<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'minijit' and '$(TargetArchitecture)' == 'x64'">
2244+
<ExcludeList Include="$(XunitTestBinBase)/Interop/Swift/SwiftRetAbiStress/**">
2245+
<Issue>https://github.com/dotnet/runtime/issues/121983</Issue>
2246+
</ExcludeList>
2247+
<ExcludeList Include="$(XunitTestBinBase)/Interop/Swift/SwiftCallbackAbiStress/**">
2248+
<Issue>https://github.com/dotnet/runtime/issues/121983</Issue>
2249+
</ExcludeList>
2250+
</ItemGroup>
2251+
22432252
<ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'minijit' and '$(TargetArchitecture)' == 'arm64'">
22442253
<ExcludeList Include="$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
22452254
<Issue>https://github.com/dotnet/runtime/issues/82859</Issue>

0 commit comments

Comments
 (0)