On Sun, Jan 12, 2020 at 10:56:00PM +0100, Miro Hrončok wrote: > On 10. 01. 20 17:36, Pierre-Yves Chibon wrote: > > Is there a different approach, e.g. by using towncrier[1] or something > > comparable, to track changes outside the spec file? > > Is the idea of using annotated git tags abandoned altogether? It was the sentence just above the section you quoted here ;-) For memory: -- So we need to, somehow, merge two changelogs into one while realizing that some information in one may not be desirable in the other (for example the world famous commit message: "oops I've forgot to upload the sources" does not need to appear in the RPM's changelog). Would it be easier to merge the git changelog with the spec changelog or the spec changelog with the bodhi notes? For the former one easy way to achieve this is to consider all the commits since the last successful build and have a magic keyword to either include or exclude a commit message in the changelog. For the latter, we discussed the idea of using annotated git tags this fall. -- > We could even create a tool that would "prefill" a template with all commit > messages since the latest annotated tag. > > So you would do: > > > - commit, commit, commit (optional pushes) > - fedpkg release > - edit the message, inspect the e:v-r, be able to abort if I don't like it > - fedpkg push - pushes the tags and branch > - fedpkg build > > > And when somebody attempts to do a untagged build, it would fail, similarly > to what it does now when you try to build unpushed changes. This is definitely an option, it might even be the simplest to implement. One observation about it though is that we would still have three changelogs then, git commit, git tags and bodhi update. So it is easier to implement as we rely on the packager to do the review of what goes into the RPM changelog. We still have Neal's question: do we let packager edit these tags? (Considering we allow editing old changelog entries, I guess we could). One question, if the release is set in koji and the changelog in git tag. If I tag foo 1.0 with a first changelog entry, then koji builds 1.0-1 with that changelog. I find out that there is a mistake in the changelog, so I edit the tag, won't koji build 1.0-2? Which would then have two repeating changelog entries one for -1 with the error and one for -2 with the fix. Does it matter? Note that this question may be applicable regardless of the solution we adopt (git tag, git commits or something else?) Pierre _______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
