I think we can really see some process improvements as well! I've been taking a look at github actions or bots that could perform cherry-picks (if conflict-free, of course) or back-porting PRs, and I've found a few interesting projects *close* to it, like https://github.com/gorillio/github-action-cherry-pick
I don't think dependabot will help us much here (allowing multple target branches): https://github.com/dependabot/dependabot-core/issues/2511 but I have to admit that I haven't investigated too thoroughly -- if we had a simple solution for backporting, it could cover this use case pretty nicely! Ideally, something like commenting: "Hey backportbot : please backport this to branch-1.11" and it would either create a PR or just do the cherry-pick, and/or report on success/failure. And yes, I also agree -- it just feels wrong these days to be pushing directly to a branch in the apache/avro repo! One more thing to consider: we currently only run github actions on `master`... There's lots of improvements to be made, but I kind of have the feeling we could end up with a *simpler* build and release in the end! All my best, Ryan On Sat, Sep 23, 2023 at 7:26 AM Oscar Westra van Holthe - Kind <os...@westravanholthe.nl> wrote: > > On fr 22 sep. 2023 18:40, Ryan Skraba <r...@skraba.com> wrote: > > > Back to this topic :D After a couple of extra releases on the > > branch-1.11, how do we feel about supporting two major releases? Have > > committers found it a pain in the butt to cherry-pick? > > > > Not a pain, but my process is not as clean as merging PR's: currently I > cherry-pick directly onto the 1.11 branch. > > If the vote on this passes, I'd also like a way of working for this. Maybe > cherry-picking directly is ok, maybe we want a policy to cherry-pick on a > new branch and create a PR (even if that is then merged without review, as > the original changes were already reviewed). > > > Is there anything we need to address before opening a vote on whether > > we should maintain two major releases? > > > > Is it possible to configure dependabot to work on both master and the last > two release branches? If so, that part would become easier. > > > Kind regards, > Oscar > > -- > Oscar Westra van Holthe - Kind <os...@westravanholthe.nl>
