Skip to content

Conversation

@akoeplinger
Copy link
Member

@akoeplinger akoeplinger commented Nov 21, 2025

Noticed this while looking at #16329, I think we shouldn't use the blob storage here either.

To double check:

@mmitche mmitche merged commit 5376144 into main Nov 24, 2025
14 checks passed
@mmitche mmitche deleted the akoeplinger-patch-2 branch November 24, 2025 19:24
@mmitche
Copy link
Member

mmitche commented Nov 24, 2025

/backport to release/10.0

@mmitche
Copy link
Member

mmitche commented Nov 24, 2025

/backport to release/9.0

@github-actions
Copy link
Contributor

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

@mmitche
Copy link
Member

mmitche commented Nov 24, 2025

/backport to release/8.0

@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: Use CDN URL instead of blob in FindDotNetCliPackage
Using index info to reconstruct a base tree...
M	src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
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 Use CDN URL instead of blob in FindDotNetCliPackage
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

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.

3 participants