[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313

Merged
matouskozak merged 12 commits into
dotnet:mainfrom
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged

[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom
matouskozak:infra/migrate-osx1200-queues

Conversation

@matouskozak

@matouskozakmatouskozak commented Mar 10, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.

iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:

  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)

Newly failing test scenarios

Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.

System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds

System.IO.IsolatedStorage

System.IO. MemoryMappedFiles

System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind

#113273

@matouskozakmatouskozak self-assigned this Mar 10, 2025
@dotnet-policy-service

dotnet-policy-serviceBot commented Mar 10, 2025

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @akoeplinger, @matouskozak
See info in area-owners.md if you want to be subscribed.

@matouskozakmatouskozak changed the title [infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot mentioned this pull request Mar 10, 2025
Open
This was referenced Mar 17, 2025
Open
Open
Closed
Closed
Open
Closed
Closed
Closed
This was referenced Mar 17, 2025
Closed
Open
Closed
@matouskozakmatouskozak mentioned this pull request Mar 24, 2025
Closed
@build-analysisbuild-analysisBot mentioned this pull request Mar 25, 2025
Closed
3 tasks
@matouskozakmatouskozak mentioned this pull request Mar 26, 2025
Closed
This was referenced Mar 28, 2025
Open
Open
Closed
@matouskozakmatouskozak mentioned this pull request Apr 1, 2025
Closed
3 tasks
@dotnetdotnet deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak changed the title [infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak

matouskozak commented Apr 9, 2025

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-extra-platforms

@azure-pipelines

azure-pipelinesBot commented Apr 9, 2025

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@build-analysisbuild-analysisBot mentioned this pull request Apr 9, 2025
Open
3 tasks
@matouskozak
matouskozak marked this pull request as ready for review April 10, 2025 08:00
CopilotAI review requested due to automatic review settings April 10, 2025 08:00
CopilotAI reviewed Apr 10, 2025
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.

@matouskozakmatouskozak changed the title [infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan approved these changes Apr 10, 2025
View reviewed changes

@ivanpovazanivanpovazan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
# don't run tests on arm64 PRs until we can get significantly more devices
- ${{ if eq(variables['isRollingBuild'], true) }}:
- iossimulator_arm64
- iossimulator_arm64

@ivanpovazanivanpovazanApr 10, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?

@matouskozakmatouskozakApr 10, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.

@steveisoksteveisokApr 11, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.

Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs Outdated
yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
if (PlatformDetection.IsNotMacCatalyst)
{
// https://github.com/dotnet/runtime/issues/114403

@ivanpovazanivanpovazanApr 10, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:
Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.

@matouskozakmatouskozakApr 10, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Sure, I'll move it up.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.

I'll mark all issues with disabled-test label after merging this PR.

@matouskozak
matouskozak merged commit 159f40e into dotnet:mainApr 14, 2025
@matouskozak

matouskozak commented Apr 14, 2025

Copy link
Copy Markdown
MemberAuthor

/backport to release/9.0-staging

@github-actions

github-actionsBot commented Apr 14, 2025

Copy link
Copy Markdown
Contributor

Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901

@github-actionsgithub-actionsBot mentioned this pull request Apr 14, 2025
Merged
4 tasks
@matouskozak

matouskozak commented Apr 14, 2025

Copy link
Copy Markdown
MemberAuthor

/backport to release/8.0-staging

@github-actions

github-actionsBot commented Apr 14, 2025

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705

@github-actions

github-actionsBot commented Apr 14, 2025

Copy link
Copy Markdown
Contributor

@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@matouskozakmatouskozak mentioned this pull request Apr 14, 2025
Merged
4 tasks
@matouskozakmatouskozak mentioned this pull request Apr 24, 2025
Closed
3 tasks
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313
Merged
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Conversation
@matouskozak
@matouskozakmatouskozak
commented
Mar 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:
  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)
Newly failing test scenarios
Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.
System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds
System.IO.IsolatedStorage
System.IO. MemoryMappedFiles
System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
#113273
@matouskozakmatouskozak
self-assigned this
Mar 10, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Mar 10, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @akoeplinger, @matouskozak

See info in area-owners.md if you want to be subscribed.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot
mentioned this pull request
Mar 10, 2025

Open


This was referenced Mar 17, 2025

Open


Open


Closed


Closed


Open


Closed


Closed


Closed


This was referenced Mar 17, 2025

Closed


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Mar 24, 2025

Closed

@build-analysisbuild-analysisBot
mentioned this pull request
Mar 25, 2025

Closed

3 tasks
@matouskozakmatouskozak
mentioned this pull request
Mar 26, 2025
 Closed


This was referenced Mar 28, 2025

Open


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Apr 1, 2025

Closed

3 tasks
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak
matouskozak
commented
Apr 9, 2025

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Apr 9, 2025

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2025

Open

3 tasks
@matouskozak
matouskozak
marked this pull request as ready for review
April 10, 2025 08:00
CopilotAI
review requested due to automatic review settings
April 10, 2025 08:00
CopilotAI
reviewed
Apr 10, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan
approved these changes
Apr 10, 2025
View reviewed changes
@ivanpovazanivanpovazan
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
 # don't run tests on arm64 PRs until we can get significantly more devices
 - ${{ if eq(variables['isRollingBuild'], true) }}:
 - iossimulator_arm64
 - iossimulator_arm64
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.
@steveisoksteveisokApr 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.
Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
Outdated

 yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
 if (PlatformDetection.IsNotMacCatalyst)
 {
 // https://github.com/dotnet/runtime/issues/114403
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Sure, I'll move it up.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
I'll mark all issues with disabled-test label after merging this PR.
@matouskozak
matouskozak
merged commit 159f40e
into
dotnet:mainApr 14, 2025
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/9.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@matouskozakmatouskozak
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozakmatouskozak
mentioned this pull request
Apr 24, 2025

Closed

3 tasks
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313
Merged
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Conversation
@matouskozak
@matouskozakmatouskozak
commented
Mar 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:
  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)
Newly failing test scenarios
Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.
System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds
System.IO.IsolatedStorage
System.IO. MemoryMappedFiles
System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
#113273
@matouskozakmatouskozak
self-assigned this
Mar 10, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Mar 10, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @akoeplinger, @matouskozak

See info in area-owners.md if you want to be subscribed.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot
mentioned this pull request
Mar 10, 2025

Open


This was referenced Mar 17, 2025

Open


Open


Closed


Closed


Open


Closed


Closed


Closed


This was referenced Mar 17, 2025

Closed


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Mar 24, 2025

Closed

@build-analysisbuild-analysisBot
mentioned this pull request
Mar 25, 2025

Closed

3 tasks
@matouskozakmatouskozak
mentioned this pull request
Mar 26, 2025
 Closed


This was referenced Mar 28, 2025

Open


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Apr 1, 2025

Closed

3 tasks
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak
matouskozak
commented
Apr 9, 2025

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Apr 9, 2025

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2025

Open

3 tasks
@matouskozak
matouskozak
marked this pull request as ready for review
April 10, 2025 08:00
CopilotAI
review requested due to automatic review settings
April 10, 2025 08:00
CopilotAI
reviewed
Apr 10, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan
approved these changes
Apr 10, 2025
View reviewed changes
@ivanpovazanivanpovazan
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
 # don't run tests on arm64 PRs until we can get significantly more devices
 - ${{ if eq(variables['isRollingBuild'], true) }}:
 - iossimulator_arm64
 - iossimulator_arm64
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.
@steveisoksteveisokApr 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.
Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
Outdated

 yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
 if (PlatformDetection.IsNotMacCatalyst)
 {
 // https://github.com/dotnet/runtime/issues/114403
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Sure, I'll move it up.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
I'll mark all issues with disabled-test label after merging this PR.
@matouskozak
matouskozak
merged commit 159f40e
into
dotnet:mainApr 14, 2025
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/9.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@matouskozakmatouskozak
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozakmatouskozak
mentioned this pull request
Apr 24, 2025

Closed

3 tasks
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313
Merged
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Conversation
@matouskozak
@matouskozakmatouskozak
commented
Mar 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:
  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)
Newly failing test scenarios
Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.
System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds
System.IO.IsolatedStorage
System.IO. MemoryMappedFiles
System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
#113273
@matouskozakmatouskozak
self-assigned this
Mar 10, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Mar 10, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @akoeplinger, @matouskozak

See info in area-owners.md if you want to be subscribed.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot
mentioned this pull request
Mar 10, 2025

Open


This was referenced Mar 17, 2025

Open


Open


Closed


Closed


Open


Closed


Closed


Closed


This was referenced Mar 17, 2025

Closed


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Mar 24, 2025

Closed

@build-analysisbuild-analysisBot
mentioned this pull request
Mar 25, 2025

Closed

3 tasks
@matouskozakmatouskozak
mentioned this pull request
Mar 26, 2025
 Closed


This was referenced Mar 28, 2025

Open


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Apr 1, 2025

Closed

3 tasks
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak
matouskozak
commented
Apr 9, 2025

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Apr 9, 2025

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2025

Open

3 tasks
@matouskozak
matouskozak
marked this pull request as ready for review
April 10, 2025 08:00
CopilotAI
review requested due to automatic review settings
April 10, 2025 08:00
CopilotAI
reviewed
Apr 10, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan
approved these changes
Apr 10, 2025
View reviewed changes
@ivanpovazanivanpovazan
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
 # don't run tests on arm64 PRs until we can get significantly more devices
 - ${{ if eq(variables['isRollingBuild'], true) }}:
 - iossimulator_arm64
 - iossimulator_arm64
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.
@steveisoksteveisokApr 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.
Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
Outdated

 yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
 if (PlatformDetection.IsNotMacCatalyst)
 {
 // https://github.com/dotnet/runtime/issues/114403
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Sure, I'll move it up.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
I'll mark all issues with disabled-test label after merging this PR.
@matouskozak
matouskozak
merged commit 159f40e
into
dotnet:mainApr 14, 2025
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/9.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@matouskozakmatouskozak
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozakmatouskozak
mentioned this pull request
Apr 24, 2025

Closed

3 tasks
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313
Merged
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Conversation
@matouskozak
@matouskozakmatouskozak
commented
Mar 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:
  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)
Newly failing test scenarios
Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.
System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds
System.IO.IsolatedStorage
System.IO. MemoryMappedFiles
System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
#113273
@matouskozakmatouskozak
self-assigned this
Mar 10, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Mar 10, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @akoeplinger, @matouskozak

See info in area-owners.md if you want to be subscribed.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot
mentioned this pull request
Mar 10, 2025

Open


This was referenced Mar 17, 2025

Open


Open


Closed


Closed


Open


Closed


Closed


Closed


This was referenced Mar 17, 2025

Closed


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Mar 24, 2025

Closed

@build-analysisbuild-analysisBot
mentioned this pull request
Mar 25, 2025

Closed

3 tasks
@matouskozakmatouskozak
mentioned this pull request
Mar 26, 2025
 Closed


This was referenced Mar 28, 2025

Open


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Apr 1, 2025

Closed

3 tasks
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak
matouskozak
commented
Apr 9, 2025

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Apr 9, 2025

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2025

Open

3 tasks
@matouskozak
matouskozak
marked this pull request as ready for review
April 10, 2025 08:00
CopilotAI
review requested due to automatic review settings
April 10, 2025 08:00
CopilotAI
reviewed
Apr 10, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan
approved these changes
Apr 10, 2025
View reviewed changes
@ivanpovazanivanpovazan
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
 # don't run tests on arm64 PRs until we can get significantly more devices
 - ${{ if eq(variables['isRollingBuild'], true) }}:
 - iossimulator_arm64
 - iossimulator_arm64
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.
@steveisoksteveisokApr 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.
Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
Outdated

 yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
 if (PlatformDetection.IsNotMacCatalyst)
 {
 // https://github.com/dotnet/runtime/issues/114403
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Sure, I'll move it up.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
I'll mark all issues with disabled-test label after merging this PR.
@matouskozak
matouskozak
merged commit 159f40e
into
dotnet:mainApr 14, 2025
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/9.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@matouskozakmatouskozak
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozakmatouskozak
mentioned this pull request
Apr 24, 2025

Closed

3 tasks
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313
Merged
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Conversation
@matouskozak
@matouskozakmatouskozak
commented
Mar 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:
  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)
Newly failing test scenarios
Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.
System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds
System.IO.IsolatedStorage
System.IO. MemoryMappedFiles
System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
#113273
@matouskozakmatouskozak
self-assigned this
Mar 10, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Mar 10, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @akoeplinger, @matouskozak

See info in area-owners.md if you want to be subscribed.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot
mentioned this pull request
Mar 10, 2025

Open


This was referenced Mar 17, 2025

Open


Open


Closed


Closed


Open


Closed


Closed


Closed


This was referenced Mar 17, 2025

Closed


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Mar 24, 2025

Closed

@build-analysisbuild-analysisBot
mentioned this pull request
Mar 25, 2025

Closed

3 tasks
@matouskozakmatouskozak
mentioned this pull request
Mar 26, 2025
 Closed


This was referenced Mar 28, 2025

Open


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Apr 1, 2025

Closed

3 tasks
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak
matouskozak
commented
Apr 9, 2025

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Apr 9, 2025

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2025

Open

3 tasks
@matouskozak
matouskozak
marked this pull request as ready for review
April 10, 2025 08:00
CopilotAI
review requested due to automatic review settings
April 10, 2025 08:00
CopilotAI
reviewed
Apr 10, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan
approved these changes
Apr 10, 2025
View reviewed changes
@ivanpovazanivanpovazan
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
 # don't run tests on arm64 PRs until we can get significantly more devices
 - ${{ if eq(variables['isRollingBuild'], true) }}:
 - iossimulator_arm64
 - iossimulator_arm64
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.
@steveisoksteveisokApr 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.
Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
Outdated

 yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
 if (PlatformDetection.IsNotMacCatalyst)
 {
 // https://github.com/dotnet/runtime/issues/114403
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Sure, I'll move it up.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
I'll mark all issues with disabled-test label after merging this PR.
@matouskozak
matouskozak
merged commit 159f40e
into
dotnet:mainApr 14, 2025
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/9.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@matouskozakmatouskozak
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozakmatouskozak
mentioned this pull request
Apr 24, 2025

Closed

3 tasks
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313
Merged
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Conversation
@matouskozak
@matouskozakmatouskozak
commented
Mar 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:
  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)
Newly failing test scenarios
Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.
System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds
System.IO.IsolatedStorage
System.IO. MemoryMappedFiles
System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
#113273
@matouskozakmatouskozak
self-assigned this
Mar 10, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Mar 10, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @akoeplinger, @matouskozak

See info in area-owners.md if you want to be subscribed.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot
mentioned this pull request
Mar 10, 2025

Open


This was referenced Mar 17, 2025

Open


Open


Closed


Closed


Open


Closed


Closed


Closed


This was referenced Mar 17, 2025

Closed


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Mar 24, 2025

Closed

@build-analysisbuild-analysisBot
mentioned this pull request
Mar 25, 2025

Closed

3 tasks
@matouskozakmatouskozak
mentioned this pull request
Mar 26, 2025
 Closed


This was referenced Mar 28, 2025

Open


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Apr 1, 2025

Closed

3 tasks
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak
matouskozak
commented
Apr 9, 2025

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Apr 9, 2025

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2025

Open

3 tasks
@matouskozak
matouskozak
marked this pull request as ready for review
April 10, 2025 08:00
CopilotAI
review requested due to automatic review settings
April 10, 2025 08:00
CopilotAI
reviewed
Apr 10, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan
approved these changes
Apr 10, 2025
View reviewed changes
@ivanpovazanivanpovazan
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
 # don't run tests on arm64 PRs until we can get significantly more devices
 - ${{ if eq(variables['isRollingBuild'], true) }}:
 - iossimulator_arm64
 - iossimulator_arm64
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.
@steveisoksteveisokApr 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.
Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
Outdated

 yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
 if (PlatformDetection.IsNotMacCatalyst)
 {
 // https://github.com/dotnet/runtime/issues/114403
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Sure, I'll move it up.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
I'll mark all issues with disabled-test label after merging this PR.
@matouskozak
matouskozak
merged commit 159f40e
into
dotnet:mainApr 14, 2025
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/9.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@matouskozakmatouskozak
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozakmatouskozak
mentioned this pull request
Apr 24, 2025

Closed

3 tasks
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues - #113313
Merged
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Apr 14, 2025
Merged
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues#113313
matouskozak merged 12 commits into
dotnet:mainfrom 
matouskozak:infra/migrate-osx1200-queues
Conversation
@matouskozak
@matouskozakmatouskozak
commented
Mar 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Currently, we are using osx.1200.amd64.open and osx.1200.arm64.open for dotnet/runtime Apple simulator and MacCatalyst jobs. Since macOS 12 is after its EOL, we should migrate to queues with newer macOS version.
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to:
  • osx.15.amd64.open
  • osx.14.arm64.open (until osx.15.arm64.open has enough machines)
Newly failing test scenarios
Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement.
System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds
System.IO.IsolatedStorage
System.IO. MemoryMappedFiles
System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
#113273
@matouskozakmatouskozak
self-assigned this
Mar 10, 2025
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Mar 10, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @akoeplinger, @matouskozak

See info in area-owners.md if you want to be subscribed.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to `osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queuesMar 10, 2025
@build-analysisbuild-analysisBot
mentioned this pull request
Mar 10, 2025

Open


This was referenced Mar 17, 2025

Open


Open


Closed


Closed


Open


Closed


Closed


Closed


This was referenced Mar 17, 2025

Closed


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Mar 24, 2025

Closed

@build-analysisbuild-analysisBot
mentioned this pull request
Mar 25, 2025

Closed

3 tasks
@matouskozakmatouskozak
mentioned this pull request
Mar 26, 2025
 Closed


This was referenced Mar 28, 2025

Open


Open


Closed

@matouskozakmatouskozak
mentioned this pull request
Apr 1, 2025

Closed

3 tasks
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@dotnetdotnet
deleted a comment from azure-pipelinesBotApr 9, 2025
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate Apple mobile jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queuesApr 9, 2025
@matouskozak
matouskozak
commented
Apr 9, 2025

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Apr 9, 2025

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2025

Open

3 tasks
@matouskozak
matouskozak
marked this pull request as ready for review
April 10, 2025 08:00
CopilotAI
review requested due to automatic review settings
April 10, 2025 08:00
CopilotAI
reviewed
Apr 10, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
@matouskozakmatouskozak
changed the title
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.15.[amd/arm64].open queues[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queuesApr 10, 2025
ivanpovazan
ivanpovazan
approved these changes
Apr 10, 2025
View reviewed changes
@ivanpovazanivanpovazan
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Comment threadeng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
 # don't run tests on arm64 PRs until we can get significantly more devices
 - ${{ if eq(variables['isRollingBuild'], true) }}:
 - iossimulator_arm64
 - iossimulator_arm64
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for clarification: Are we sure we now have the right capacity?
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't timing out on this PR, so I thought we can try it on main and see how it goes, we can always disable again in the future.
@steveisoksteveisokApr 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the approach. I can't remember how many arm64 machines we had back when it was disabled, but it's a safe bet we had way less.
Comment threadsrc/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
Outdated

 yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
 if (PlatformDetection.IsNotMacCatalyst)
 {
 // https://github.com/dotnet/runtime/issues/114403
@ivanpovazanivanpovazanApr 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.

Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
@matouskozakmatouskozakApr 10, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe moving the comment above the if, and adding "Skipped on MacCatalyst..." makes it clearer. I don't have strong opinion just find it weird to read.
Sure, I'll move it up.
Additionally, in the mentioned issue it makes sense to note that the test got disabled in this PR so it is easier to track down when we fix the mentioned issue.
I'll mark all issues with disabled-test label after merging this PR.
@matouskozak
matouskozak
merged commit 159f40e
into
dotnet:mainApr 14, 2025
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/9.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14439630901
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozak
matouskozak
commented
Apr 14, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/14450187705
@github-actions
github-actionsBot
commented
Apr 14, 2025

Copy link


Copy Markdown

Contributor
@matouskozak backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: migrate apple mobile jobs to osx.15 queue
Applying: use osx 14 for arm64 and enable simulators
Applying: Revert "use osx 14 for arm64 and enable simulators"
Applying: use osx.14.arm64 queues
Applying: enable arm64 simulators and maccatalyst on PRs
Applying: dis MulticastInterface_Set_AnyInterface_Succeeds
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0006 dis MulticastInterface_Set_AnyInterface_Succeeds
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@matouskozakmatouskozak
mentioned this pull request
Apr 14, 2025
 Merged

4 tasks
@matouskozakmatouskozak
mentioned this pull request
Apr 24, 2025

Closed

3 tasks
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 15, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@kotlarmiloskotlarmiloskotlarmilos approved these changes
@ivanpovazanivanpovazanivanpovazan approved these changes
@steveisoksteveisokAwaiting requested review from steveisok
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@matouskozakmatouskozak

Labels

area-Infrastructure-monoos-iosApple iOSos-maccatalystMacCatalyst OSos-tvosApple tvOS

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@matouskozak@steveisok@kotlarmilos@ivanpovazan