Skip to content

Commit a3f4ac1

Browse files
author
Mirroring
committed
Merge commit '6aebff6a34fe10fccab3e809cefce9b060fdfc5c'
2 parents 8ee4ad4 + 6aebff6 commit a3f4ac1

File tree

34 files changed

+13684
-251
lines changed

34 files changed

+13684
-251
lines changed

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

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

3737
# iOS Simulator/Mac Catalyst arm64
3838
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
39-
- OSX.1200.Arm64.Open
39+
- OSX.14.Arm64.Open
4040

4141
# iOS/tvOS Simulator x64 & MacCatalyst x64
4242
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
43-
- OSX.1200.Amd64.Open
43+
- OSX.15.Amd64.Open
4444

4545
# Android arm64
4646
- ${{ if in(parameters.platform, 'android_arm64') }}:

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ jobs:
2525
platforms:
2626
- iossimulator_x64
2727
- tvossimulator_x64
28-
# don't run tests on arm64 PRs until we can get significantly more devices
29-
- ${{ if eq(variables['isRollingBuild'], true) }}:
30-
- iossimulator_arm64
28+
- iossimulator_arm64
3129
variables:
3230
# map dependencies variables to local variables
3331
- name: librariesContainsChange
@@ -61,9 +59,7 @@ jobs:
6159
platforms:
6260
- iossimulator_x64
6361
- tvossimulator_x64
64-
# don't run tests on arm64 PRs until we can get significantly more devices
65-
- ${{ if eq(variables['isRollingBuild'], true) }}:
66-
- iossimulator_arm64
62+
- iossimulator_arm64
6763
variables:
6864
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
6965
- name: _HelixSource
@@ -109,9 +105,7 @@ jobs:
109105
platforms:
110106
- iossimulator_x64
111107
- tvossimulator_x64
112-
# don't run tests on arm64 PRs until we can get significantly more devices
113-
- ${{ if eq(variables['isRollingBuild'], true) }}:
114-
- iossimulator_arm64
108+
- iossimulator_arm64
115109
variables:
116110
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
117111
- name: _HelixSource

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
7373
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
7474
- (AzureLinux.3.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
75-
- (openSUSE.15.2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
75+
- (openSUSE.15.6.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.6-helix-amd64
7676
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
7777
- (Centos.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
7878
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
@@ -105,11 +105,11 @@ jobs:
105105

106106
# iOS Simulator/Mac Catalyst arm64
107107
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
108-
- OSX.1200.Arm64.Open
108+
- OSX.14.Arm64.Open
109109

110110
# iOS/tvOS Simulator x64 & MacCatalyst x64
111111
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
112-
- OSX.1200.Amd64.Open
112+
- OSX.15.Amd64.Open
113113

114114
# iOS devices
115115
- ${{ if in(parameters.platform, 'ios_arm64') }}:

eng/pipelines/libraries/outerloop-mono.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ schedules:
66
branches:
77
include:
88
- main
9+
always: false # run only if there were changes since the last successful scheduled run.
910

1011
variables:
1112
- template: variables.yml

eng/pipelines/libraries/outerloop.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ schedules:
66
branches:
77
include:
88
- main
9-
- release/*.*
9+
- release/*.0
10+
always: false # run only if there were changes since the last successful scheduled run.
1011

1112
variables:
1213
- template: variables.yml

eng/pipelines/runtime.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,7 @@ extends:
721721
runtimeFlavor: mono
722722
platforms:
723723
- maccatalyst_x64
724-
- ${{ if eq(variables['isRollingBuild'], true) }}:
725-
- maccatalyst_arm64
724+
- maccatalyst_arm64
726725
variables:
727726
# map dependencies variables to local variables
728727
- name: librariesContainsChange

0 commit comments

Comments
 (0)