search

OSInside / kiwi

KIWI - Appliance Builder Next Generation
https://osinside.github.io/kiwi
GNU General Public License v3.0
300 stars 152 forks source link

Add changelog fix file for commit deb6ca #2490

Closed schaefi closed 7 months ago

schaefi commented 7 months ago

The commit used a wrong e-mail address which should not land in the created changes file for the packaging

schaefi commented 7 months ago

@davidcassany I had some trouble with the update of the reference changelog and I think we should not touch it. Instead I propose a concept that allows an overwrite per commit. Thoughts ?

davidcassany commented 7 months ago

@schaefi I am fine with not touching the reference file, I was also not happy with such an approach. I think your idea is good enough as long as it doesn't have to be used often. If additional changes like that in the future are needed it might turn to be unmanageable having a file per commit fix, but if that happens (I really hope it won't) then probably the whole changes file approach should be revisited.

A bit unrelated but something I have also realized with this issue is that we are building the change log and ordering it based on the author date, not the committer date. Which is fine for main, but could to be tricky for master if commits are not cherry-picked with the former order, in master cherry-picked commits not appear with the order of the cherry-pick action but with the other of the author date. I don't think we can do much about it other than paying attention to it, this could cause submissions that append interleaved change log entries, which shouldn't be that bad, but still not a clean pre-append.

schaefi commented 7 months ago

A bit unrelated but something I have also realized with this issue is that we are building the change log and ordering it based on the author date, not the committer date. Which is fine for main, but could to be tricky for master if commits are not cherry-picked with the former order, in master cherry-picked commits not appear with the order of the cherry-pick action but with the other of the author date. I don't think we can do much about it other than paying attention to it, this could cause submissions that append interleaved change log entries, which shouldn't be that bad, but still not a clean pre-append.

Yes you are absolutely right on this. Actually I hope that the move to poetry will finish soon. I'm finished with the "no finalizer" refactor and we already have dropped what we wanted to drop. Thus I would like to submit kiwi10 to ALP and TW(Factory) asap which then stops maintaining and cherry-picking to master. We had that interleaved changelog entries in the past and it fortunately was not an issue for suse's changelog management.

I also agree if there are more issues around the changes creation in the future we need to revisit the concept