Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Consolidate <NativeAotSupported definitions (#103273)" #103497

Merged
merged 4 commits into from
Jun 15, 2024

Conversation

MichalStrehovsky
Copy link
Member

These failures are actually nondeterministic:

https://dnceng.visualstudio.com/internal/_build/results?buildId=2474015&view=results was a clean build.

https://dnceng.visualstudio.com/internal/_build/results?buildId=2474150&view=results after that failed in the MUSL x64 leg the same way I posted in #103469 (seemingly used wrong path to invoke ilc).

Cc @am11 sorry I got to roll this back for now.

@am11
Copy link
Member

am11 commented Jun 15, 2024

It only requires reverting one file src/native/managed/compile-native.proj, not everything.

am11 added a commit to am11/runtime that referenced this pull request Jun 15, 2024
@am11 am11 mentioned this pull request Jun 15, 2024
@MichalStrehovsky
Copy link
Member Author

/ba-g infra timeouts timeouts

@MichalStrehovsky MichalStrehovsky merged commit 7e9cab2 into dotnet:main Jun 15, 2024
150 of 156 checks passed
@MichalStrehovsky MichalStrehovsky deleted the rollbacks branch June 15, 2024 08:16
@MichalStrehovsky
Copy link
Member Author

It only requires reverting one file src/native/managed/compile-native.proj, not everything.

My boss's boss was asking about this last night. Apparently nobody bothered to merge this while I was sleeping. I'll not take any more risks with this right now.

@am11
Copy link
Member

am11 commented Jun 15, 2024

Yea, no rush. Lets unblock the official build then revert the revert. Pretty sure #103508 will fix the issue as I was able to repro it locally.

am11 added a commit to am11/runtime that referenced this pull request Jun 15, 2024
am11 added a commit to am11/runtime that referenced this pull request Jun 15, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Jul 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants