Skip to content

Reduce the paths that binskim scans#16288

Merged
mmitche merged 1 commit intodotnet:mainfrom
mmitche:binskim-test
Nov 12, 2025
Merged

Reduce the paths that binskim scans#16288
mmitche merged 1 commit intodotnet:mainfrom
mmitche:binskim-test

Conversation

@mmitche
Copy link
Member

@mmitche mmitche commented Nov 12, 2025

Reduce the paths to avoid a ton of noise from test assets, wix, etc. This noise is caused by Arcade's upload of output for validation.

To double check:

Reduce the paths to avoid a ton of noise from test assets, wix, etc. This noise is caused by Arcade's upload of output for validation.
@mmitche
Copy link
Member Author

mmitche commented Nov 12, 2025

/backport to release/10.0

@mmitche
Copy link
Member Author

mmitche commented Nov 12, 2025

/backport to release/9.0

@mmitche
Copy link
Member Author

mmitche commented Nov 12, 2025

/backport to release/8.0

@github-actions
Copy link
Contributor

Started backporting to release/10.0 (link to workflow run)

@github-actions
Copy link
Contributor

Started backporting to release/9.0 (link to workflow run)

@github-actions
Copy link
Contributor

Started backporting to release/8.0 (link to workflow run)

@github-actions
Copy link
Contributor

@mmitche backporting to release/9.0 failed, the patch most likely resulted in conflicts. Please backport manually!

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

Applying: Reduce the paths that binskim scans Reduce the paths to avoid a ton of noise from test assets, wix, etc. This noise is caused by Arcade's upload of output for validation.
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
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 Reduce the paths that binskim scans Reduce the paths to avoid a ton of noise from test assets, wix, etc. This noise is caused by Arcade's upload of output for validation.
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@github-actions
Copy link
Contributor

@mmitche backporting to release/8.0 failed, the patch most likely resulted in conflicts. Please backport manually!

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

Applying: Reduce the paths that binskim scans Reduce the paths to avoid a ton of noise from test assets, wix, etc. This noise is caused by Arcade's upload of output for validation.
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
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 Reduce the paths that binskim scans Reduce the paths to avoid a ton of noise from test assets, wix, etc. This noise is caused by Arcade's upload of output for validation.
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@mmitche mmitche requested a review from ericstj November 12, 2025 16:09
@mmitche mmitche enabled auto-merge (squash) November 12, 2025 16:25
@mmitche mmitche merged commit 735e6ab into dotnet:main Nov 12, 2025
10 checks passed
mmitche added a commit to mmitche/arcade that referenced this pull request Nov 12, 2025
mmitche added a commit to mmitche/arcade that referenced this pull request Nov 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants