From dfc22acb7db38633d05666af2aa45819395de382 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 11 Aug 2025 21:44:14 +0000 Subject: [PATCH 1/4] Initial plan From dbee48c53a9cbf16df2856be25755b2ae08a0484 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 11 Aug 2025 22:09:44 +0000 Subject: [PATCH 2/4] Add macOS 26 (Tahoe) support to runtime-extra-platforms helix queues Co-authored-by: bartonjs <10642668+bartonjs@users.noreply.github.com> --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 10 +++++++--- eng/pipelines/installer/helix-queues-setup.yml | 10 ++++++++-- eng/pipelines/libraries/helix-queues-setup.yml | 10 ++++++++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 3b1ae77b6d6abe..5564dcbf2622dc 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -104,9 +104,11 @@ jobs: # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: + - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.isExtraPlatformsBuild, true)) }}: + - OSX.26.Arm64.Open + - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: - OSX.13.Arm64.Open - - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: + - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: # superpmi is not about testing platform differences, so go with highest capacity queue - OSX.14.Arm64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: @@ -114,7 +116,9 @@ jobs: # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.isExtraPlatformsBuild, true)) }}: + - OSX.26.Amd64.Open + - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true)) }}: - OSX.1200.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - OSX.1200.Amd64 diff --git a/eng/pipelines/installer/helix-queues-setup.yml b/eng/pipelines/installer/helix-queues-setup.yml index 582294a4a39d6a..6bf18f8be29619 100644 --- a/eng/pipelines/installer/helix-queues-setup.yml +++ b/eng/pipelines/installer/helix-queues-setup.yml @@ -45,11 +45,17 @@ jobs: # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - - osx.13.Arm64.Open + - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.26.Arm64.Open + - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - osx.13.Arm64.Open # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: - - OSX.1200.Amd64.Open + - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.26.Amd64.Open + - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.1200.Amd64.Open # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index fdebac85bc327a..556adb8ec495cf 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -78,11 +78,17 @@ jobs: # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - - osx.13.arm64.open + - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.26.Arm64.Open + - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - osx.13.arm64.open # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: - - OSX.1200.Amd64.Open + - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.26.Amd64.Open + - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.1200.Amd64.Open # Android - ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}: From 43fd4bc0dd08314eebe4a90acaa4e5165b4831fc Mon Sep 17 00:00:00 2001 From: Jeremy Barton Date: Tue, 12 Aug 2025 17:18:05 -0700 Subject: [PATCH 3/4] Revert AMD64 portions of the change, no osx.26.amd64 queues --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 4 +--- eng/pipelines/installer/helix-queues-setup.yml | 5 +---- eng/pipelines/libraries/helix-queues-setup.yml | 5 +---- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 5564dcbf2622dc..5cb807738cd971 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -116,9 +116,7 @@ jobs: # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: - - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.isExtraPlatformsBuild, true)) }}: - - OSX.26.Amd64.Open - - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true)) }}: + - ${{ if eq(variables['System.TeamProject'], 'public') }}: - OSX.1200.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - OSX.1200.Amd64 diff --git a/eng/pipelines/installer/helix-queues-setup.yml b/eng/pipelines/installer/helix-queues-setup.yml index 6bf18f8be29619..51ff895c753a87 100644 --- a/eng/pipelines/installer/helix-queues-setup.yml +++ b/eng/pipelines/installer/helix-queues-setup.yml @@ -52,10 +52,7 @@ jobs: # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: - - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: - - OSX.26.Amd64.Open - - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: - - OSX.1200.Amd64.Open + - OSX.1200.Amd64.Open # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 556adb8ec495cf..6573f4a7241ffe 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -85,10 +85,7 @@ jobs: # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: - - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: - - OSX.26.Amd64.Open - - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: - - OSX.1200.Amd64.Open + - OSX.1200.Amd64.Open # Android - ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}: From 55d0176b4a784e561dcccfaaec4770a8e18997b3 Mon Sep 17 00:00:00 2001 From: Jeremy Barton Date: Thu, 14 Aug 2025 09:29:44 -0700 Subject: [PATCH 4/4] Add macOS.arm64 to libraries+coreclr extra-platforms --- eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index d4c755945c0372..1c956658e4f7ba 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -21,6 +21,7 @@ jobs: - linux_arm64 - linux_musl_x64 - osx_x64 + - osx_arm64 - windows_x64 - windows_x86 - windows_arm64