Fix pipeline triggers to include release/10.0#16089
Merged
akoeplinger merged 1 commit intomainfrom Aug 28, 2025
Merged
Conversation
Also use a wildcard so we don't need to do this again in 11.0
Member
Author
|
/backport to release/10.0 |
Contributor
|
Started backporting to release/10.0: https://github.com/dotnet/arcade/actions/runs/17299025661 |
Contributor
|
@akoeplinger backporting to "release/10.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix pipeline triggers to include release/10.0
.git/rebase-apply/patch:44: trailing whitespace.
- release/*.0
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M azure-pipelines-pr.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-pr.yml
CONFLICT (content): Merge conflict in azure-pipelines-pr.yml
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 0001 Fix pipeline triggers to include release/10.0
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Member
|
@akoeplinger are you sure this regex works with ADO? |
premun
approved these changes
Aug 28, 2025
1 task
Member
Author
|
@premun yes we use it in the runtime repo |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Also use a wildcard so we don't need to do this again in 11.0
To double check: