Skip to content

Commit b88c92a

Browse files
authored
Update iOS and tvOS device queues to OSX 15 (#122702)
## Description This PR updates the iOS and tvOS device queues from the scouting queues to macOS 15 with Xcode 26.
1 parent ee0d069 commit b88c92a

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

eng/pipelines/coreclr/templates/helix-queues-setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454

5555
# iOS devices
5656
- ${{ if in(parameters.platform, 'ios_arm64') }}:
57-
- osx.amd64.iphone.scouting.open
57+
- osx.15.amd64.iphone.open
5858

5959
# tvOS devices
6060
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
61-
- osx.amd64.appletv.scouting.open
61+
- osx.15.amd64.appletv.open
6262

6363
# Linux arm
6464
- ${{ if eq(parameters.platform, 'linux_arm') }}:

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
2424
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
2525
platforms:
26-
# - ios_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
26+
- ios_arm64
2727
- tvos_arm64
2828
variables:
2929
# map dependencies variables to local variables
@@ -64,7 +64,7 @@ jobs:
6464
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
6565
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
6666
platforms:
67-
# - ios_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
67+
- ios_arm64
6868
- tvos_arm64
6969
variables:
7070
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
@@ -108,7 +108,7 @@ jobs:
108108
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
109109
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
110110
platforms:
111-
# - ios_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
111+
- ios_arm64
112112
- tvos_arm64
113113
variables:
114114
# map dependencies variables to local variables
@@ -179,7 +179,7 @@ jobs:
179179
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
180180
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
181181
platforms:
182-
# - ios_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
182+
- ios_arm64
183183
- tvos_arm64
184184
variables:
185185
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
@@ -222,7 +222,7 @@ jobs:
222222
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
223223
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
224224
platforms:
225-
# - ios_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
225+
- ios_arm64
226226
- tvos_arm64
227227
variables:
228228
# map dependencies variables to local variables

eng/pipelines/helix-platforms.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,20 @@ variables:
6868
# macOS for iOS device testing
6969
# Latest
7070
- name: helix_macos_ios_device_latest
71-
value: OSX.13.Amd64.Iphone.Open
71+
value: OSX.15.Amd64.Iphone.Open
7272

7373
# Oldest
7474
- name: helix_macos_ios_device_oldest
75-
value: OSX.13.Amd64.Iphone.Open
75+
value: OSX.15.Amd64.Iphone.Open
7676

7777
# macOS for tvOS device testing
7878
# Latest
7979
- name: helix_macos_tvos_device_latest
80-
value: OSX.13.Amd64.AppleTV.Open
80+
value: OSX.15.Amd64.AppleTV.Open
8181

8282
# Oldest
8383
- name: helix_macos_tvos_device_oldest
84-
value: OSX.13.Amd64.AppleTV.Open
84+
value: OSX.15.Amd64.AppleTV.Open
8585

8686
# ===========================================
8787
# Linux Platforms
@@ -106,7 +106,7 @@ variables:
106106
# Latest: 26.04
107107
- name: helix_linux_x64_ubuntu_latest
108108
value: (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-amd64
109-
109+
110110
# Oldest: 22.04
111111
- name: helix_linux_x64_ubuntu_oldest
112112
value: Ubuntu.2204.Amd64.Open
@@ -124,11 +124,11 @@ variables:
124124
# Latest: 43
125125
- name: helix_linux_x64_fedora_latest
126126
value: (Fedora.43.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-43-helix-amd64
127-
127+
128128
# Oldest: 42
129129
- name: helix_linux_x64_fedora_oldest
130130
value: (Fedora.42.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-42-helix-amd64
131-
131+
132132
# openSUSE x64
133133
# Latest: 15.6
134134
- name: helix_linux_x64_opensuse_latest
@@ -166,7 +166,7 @@ variables:
166166
# Latest: Ubuntu 26.04
167167
- name: helix_linux_arm64_latest
168168
value: (Ubuntu.2604.ArmArch.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-arm64v8
169-
169+
170170
# Oldest: Ubuntu 22.04
171171
- name: helix_linux_arm64_oldest
172172
value: Ubuntu.2204.ArmArch.Open

eng/pipelines/libraries/helix-queues-setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ jobs:
100100

101101
# iOS devices
102102
- ${{ if in(parameters.platform, 'ios_arm64') }}:
103-
- osx.amd64.iphone.scouting.open
103+
- osx.15.amd64.iphone.open
104104

105105
# tvOS devices
106106
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
107-
- osx.amd64.appletv.scouting.open
107+
- osx.15.amd64.appletv.open
108108

109109
# windows x64
110110
- ${{ if eq(parameters.platform, 'windows_x64') }}:

eng/pipelines/runtime.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ extends:
10351035
runtimeFlavor: mono
10361036
platforms:
10371037
- ios_arm64
1038-
# - tvos_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
1038+
- tvos_arm64
10391039
variables:
10401040
# map dependencies variables to local variables
10411041
- name: librariesContainsChange
@@ -1047,7 +1047,7 @@ extends:
10471047
jobParameters:
10481048
testGroup: innerloop
10491049
nameSuffix: AllSubsets_Mono_Smoke
1050-
buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:RunSmokeTestsOnly=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=false /p:EnableAggressiveTrimming=true
1050+
buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:RunSmokeTestsOnly=true /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=false /p:EnableAggressiveTrimming=true
10511051
timeoutInMinutes: 120
10521052
condition: >-
10531053
or(
@@ -1057,12 +1057,12 @@ extends:
10571057
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
10581058
eq(variables['isRollingBuild'], true))
10591059
# extra steps, run tests
1060-
# TODO: Re-enable build on helix https://github.com/dotnet/runtime/issues/121967
10611060
postBuildSteps:
10621061
- template: /eng/pipelines/libraries/helix.yml
10631062
parameters:
10641063
creator: dotnet-bot
10651064
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
1065+
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
10661066
condition: >-
10671067
or(
10681068
eq(variables['librariesContainsChange'], true),
@@ -1081,7 +1081,7 @@ extends:
10811081
runtimeFlavor: coreclr
10821082
platforms:
10831083
- ios_arm64
1084-
# - tvos_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
1084+
- tvos_arm64
10851085
variables:
10861086
# map dependencies variables to local variables
10871087
- name: librariesContainsChange
@@ -1126,7 +1126,7 @@ extends:
11261126
runtimeFlavor: coreclr
11271127
platforms:
11281128
- ios_arm64
1129-
# - tvos_arm64 TODO: Enable when Helix queue upgrade is finished https://github.com/dotnet/runtime/issues/122452
1129+
- tvos_arm64
11301130
variables:
11311131
# map dependencies variables to local variables
11321132
- name: librariesContainsChange

0 commit comments

Comments
 (0)