Define installer-owned directories in dotnet-runtime RPM package#97183
Conversation
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7849085534 |
|
/backport to release/7.0-staging |
|
/backport to release/6.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/7849091600 |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/7849092896 |
|
@NikolaMilosavljevic backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Define installer-owned directories
Using index info to reconstruct a base tree...
M src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
Falling back to patching base and 3-way merge...
Auto-merging src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
CONFLICT (content): Merge conflict in src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Define installer-owned directories
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! |
|
@NikolaMilosavljevic an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
@NikolaMilosavljevic backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Define installer-owned directories
Using index info to reconstruct a base tree...
M src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
Falling back to patching base and 3-way merge...
Auto-merging src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
CONFLICT (content): Merge conflict in src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Define installer-owned directories
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! |
|
@NikolaMilosavljevic an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
dotner-runtimeRPM package does not define any directories it owns. This causes versioned directory to be left on the machine after uninstall or package upgrade.Support for installer-owned directories already exists in shared infra and is currently used by
dotnet-hostfxrpackage:runtime/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
Line 48 in 2f63046
Similarly,
aspnetcore-runtimepackage has this correct: https://github.com/dotnet/aspnetcore/blob/29a9c90edf6dbd773296723e8f82605d0364d9f2/src/Installers/Rpm/Rpm.Runtime.Common.targets#L28