Build .rpm's for Mariner 2#40456
Build .rpm's for Mariner 2#40456wtgodbe merged 2 commits intodotnet:mainfrom wtgodbe:wtgodbe/mariner
Conversation
dougbu
left a comment
There was a problem hiding this comment.
More broadly, what is the value of .deb and .rpm files with different names and no other changes❔ That is, is the requirement primarily a release issue❔
| <CblMarinerTargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-cm.1-x64.rpm</CblMarinerTargetFileName> | ||
| <CblMariner2TargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-cm.2-x64.rpm</CblMariner2TargetFileName> |
There was a problem hiding this comment.
nit: Might be worth setting $(CblMarinerTargetFileName), $(CblMariner2TargetFileName), $(CblMarinerTargetPath), and $(CblMariner2TargetPath) in the Directory.Build.props file. Could go further and elminate most of this <PropertyGroup/>, just set a $(RpmBaseName) property in the project files.
There was a problem hiding this comment.
The arch is involved there for SharedFx but not Targeting Pack - I'll do that in the follow-up Linux Arm64 .rpm PR since that'll be dealing with arch anyways
Yeah, it's a release requirement. @NikolaMilosavljevic may be able to provide more detail |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1918018830 |
|
@wtgodbe backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Build .rpm's for Mariner 2
Using index info to reconstruct a base tree...
M src/Installers/Rpm/Directory.Build.targets
M src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
Falling back to patching base and 3-way merge...
Auto-merging src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
CONFLICT (content): Merge conflict in src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
Auto-merging src/Installers/Rpm/Directory.Build.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Build .rpm's for Mariner 2
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! |
It gives on option for different signing certificate - an external requirement. |
|
Hi @NikolaMilosavljevic. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context. |
Fixes #40253. Needs to be backported to 6.0. Test build: https://dev.azure.com/dnceng/internal/_build/results?buildId=1636918&view=results
FYI @NikolaMilosavljevic