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

Temporarily disable Mono Desktop Windows Release x64 #45529

Merged
merged 1 commit into from
Dec 3, 2020

Conversation

hoyosjs
Copy link
Member

@hoyosjs hoyosjs commented Dec 3, 2020

See #45524

@hoyosjs hoyosjs requested a review from safern December 3, 2020 04:07
@hoyosjs hoyosjs marked this pull request as ready for review December 3, 2020 04:12
@hoyosjs hoyosjs requested a review from akoeplinger December 3, 2020 04:12
@ghost
Copy link

ghost commented Dec 3, 2020

Hello @hoyosjs!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@hoyosjs hoyosjs merged commit fa9c9fb into dotnet:master Dec 3, 2020
@hoyosjs
Copy link
Member Author

hoyosjs commented Dec 10, 2020

/backport to release/5.0

@github-actions
Copy link
Contributor

Started backporting to release/5.0: https://github.com/dotnet/runtime/actions/runs/412608141

@github-actions
Copy link
Contributor

@hoyosjs backporting to release/5.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Temporarily disable Mono Desktop Windows Release x64
error: sha1 information is lacking or useless (eng/pipelines/runtime.yml).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Temporarily disable Mono Desktop Windows Release x64
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

hoyosjs added a commit that referenced this pull request Dec 10, 2020
Anipik pushed a commit that referenced this pull request Dec 10, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Jan 9, 2021
@hoyosjs hoyosjs deleted the juhoyosa/disable-monodesk-win-x64 branch June 29, 2021 23:04
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