Ignore Authenticate Reunion NuGet sources#11145
Merged
Conversation
jfversluis
approved these changes
Nov 7, 2022
mattleibow
approved these changes
Nov 7, 2022
Member
Maybe the token expired? I had to create a PAT for the service connection Also, we use it for the reunion maestro: https://github.com/dotnet/maui/pulls/app%2Freunion-maestro |
Member
Author
|
/backport to net7.0 |
Contributor
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/3411158906 |
Contributor
|
@rmarinho backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Ignore Authenticate Reunion NuGet sources
Applying: Try install .net after provisioning run
error: sha1 information is lacking or useless (eng/pipelines/common/provision.yml).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Try install .net after provisioning run
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 128Please backport manually! |
Contributor
|
@rmarinho an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
rmarinho
added a commit
that referenced
this pull request
Nov 7, 2022
* Ignore Authenticate Reunion NuGet sources * Try install .net after provisioning run * Fix identation # Conflicts: # eng/pipelines/common/provision.yml
jfversluis
pushed a commit
that referenced
this pull request
Nov 8, 2022
* Ignore Authenticate Reunion NuGet sources (#11145) * Ignore Authenticate Reunion NuGet sources * Try install .net after provisioning run * Fix identation # Conflicts: # eng/pipelines/common/provision.yml * Fix bad merge on provisionator version
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Change