Migrate to 1ES templates #7734
Merged
Migrate to 1ES templates #7734
Conversation
This file contains 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
nagilson
reviewed
Mar 19, 2024
Deleted |
marcpopMSFT
reviewed
Mar 19, 2024
marcpopMSFT
approved these changes
Mar 19, 2024
|
/backport to release/8.0.1xx |
|
Started backporting to release/8.0.1xx: https://github.com/dotnet/templating/actions/runs/8365381471 |
|
@joeloff backporting to release/8.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add templates-official and 1ES resource
Applying: Add extends
.git/rebase-apply/patch:231: trailing whitespace.
.git/rebase-apply/patch:240: trailing whitespace.
.git/rebase-apply/patch:254: trailing whitespace.
.git/rebase-apply/patch:274: trailing whitespace.
.git/rebase-apply/patch:303: trailing whitespace.
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Using index info to reconstruct a base tree...
M azure-pipelines.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines.yml
CONFLICT (content): Merge conflict in azure-pipelines.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Add extends
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! |
|
@joeloff an error occurred while backporting to release/8.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
joeloff
added a commit
to joeloff/templating
that referenced
this pull request
Mar 21, 2024
Migrate to 1ES templates
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.