search

theforeman / foreman-documentation

Documentation for the Foreman Project and its ecosystem
https://docs.theforeman.org
Creative Commons Attribution Share Alike 4.0 International
18 stars 91 forks source link

[RFC] Use "patchback" Service to handle cherry-picks? #2320

Open maximiliankolb opened 1 year ago

maximiliankolb commented 1 year ago

Current status: Users that open a PR can mark Foreman/Katello versions to ask for cherry-picks after merging. It's up to the person merging to also do cherry-picks and potentially ping the original creator of the PR to resolve merge conflicts for certain branches.

Idea: Use a Github bot to automatically create PRs with cherry-picked commits based on labels. This workflow is currently used for Pulp.

initial discussion: https://github.com/theforeman/foreman-documentation/pull/2249#issuecomment-1643971430

maximiliankolb commented 1 year ago

my personal opinion: I'm leaning towards keeping it as is because it's not that big of a hassel but adds extra complexity + notifications when the bot opens PRs.

adamlazik1 commented 1 year ago

I am fine either way.

ekohl commented 1 year ago

You will have more PRs and more noise, by a lot. Because we often have cherry picks to 7 branches you will 28 emails about it (1 for each PR opened, a comment in the original PR that a PR was opened, a comment with the preview, 1 for it merged).

On the plus side, it does allow you to work without the terminal. You can review the changes better.

There's also https://github.com/sanitizers/patchback-github-app/issues/35 which currently blocks it on a technical level.

At this moment I think the upsides don't outweigh the downsides.

Odilhao commented 11 months ago

Just found this thread, so I'm planning to use patchback in theforeman/pulpcore-packaging, we already have a heavy cherrypick based workflow there, specially for libs that are shared between the same python version.