On Tue, Nov 20, 2018 at 1:57 PM Michal Novotny <clime@xxxxxxxxxx> wrote:
On Tue, Nov 20, 2018 at 12:43 PM Tomas Tomecek <ttomecek@xxxxxxxxxx> wrote:> * Matthew Miller:
>
>
> Make it cheap to maintain branches. I expect that one what to achieve
> this would be to build directly out of Git, with synthesized release
> numbers and changelogs. This way, you can apply a lot of fixes to
> multiple branches without encountering mandatory conflicts.
We are aiming for something similar what you just described. I created this wiki page to describe the work briefly:
https://fedoraproject.org/wiki/CI/source-git
The actualy work is happening here now:
https://github.com/user-cont/source-git
We would love to take development off dist-git (but keep dist-git!) and move it to git repos with real source code which match upstream repositories. In such repo you have branches which track respective Fedora versions -- you can easily cherry pick fixes. We would validate every pull request in such repo and stuff would get merged only when it passes testing. Right now we are trying to write minimal code to make such thing work, evaluate it and present at devconf.cz to get some more feedback.
Hopefully we would utilize clime's work to help with changelogs and release numbers: https://pagure.io/rpkg-util/pull-request/15So that would be cool if my work is actually used. I recommend looking at https://pagure.io/rpkg-util/blob/master/f/macros specifically if you could use that.I planned to open a PR for python-rpkg do enable this functionality in Fedora but I am being delayed by work on rpkg-3.0, which is yet another *pkg client.Anyway, if there is some interest in making this available in Fedora soon, I can happily do it first. Just kick (contact) me.To be clear, the macros can only do the second point from "What and why?" at https://github.com/user-cont/source-git.
The README was changed meawhile so the second point from here: https://github.com/user-cont/source-git/blob/3f0875dcaa08a48562d19879cf53104bcac5cdd4/README.md
As for Fabio's question below if this would imply mirroring upstream Git repos in our DistGit: If rpkg macros are employed (linked above), thenboth use-cases (mirroring and uploading tarballs) will be possible. It will depend on packager's decision for each individual package and youcould switch between these two anytime. It would also actually mean that development stays on DistGit and is encouraged there.M.
Tomas
_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
_______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
