Create cherry-pick-to-support.yml

[KerstinKeller]

Allow to cherry pick pick selected commits to support branches.

[FlorianReimold]

Currently testing in a fork. I will report back once the tests are finished. I will make necessary modifications in this branch.

[FlorianReimold]

I fixed the workflow a little. The remaining issues are:

1. The Action is already deprecated and will seize to function in "Spring 2024"

   Cherry pick into support/v5.12
   Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: carloscastrojumo/github-cherry-pick-action@v1.0.9.
   For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
   

2. The Action fails when getting a cherry-pick conflict. I will be easy to overlook those, as no PR is created for conflicting commits. It would be better to get anything that can be used for fixing the conflict.
   Solution: Let the workflow create an issue or an empty PR that the user can use for cherry-picking & resolving merge conflicts

   

3. The labels are a little more verbose than I would like them to be. The action re-labels the cherry-pick PRs with the original labels, so all cherry-pick PRs are marked for cherry-picking again.

   

[FlorianReimold]

Another issue I have found is when using Rebase-merges:

• The action only cherry-picks the last commit of a rebase merge and loses everything else. The following cherr-pick PR was created from 2 rebased commits that added "Commit 13" and "Commit 14" to a readme file, but only "Commit 14" is present in the cherry-pick PR

  Solutions

  • Only allow Squash merges, so PRs can always only result in 1 commit
  • Fork or re-implement cherry pick job and enable it to cherry-pick all commits that were created.
    https://www.kenmuse.com/blog/the-many-shas-of-a-github-pull-request/

  

• The action sometimes cherry-picks lines that were not changed by the PR. I think it has something to do with the options --strategy=recursive --strategy-option=theirs:
  The original PR had 2 rebase-merged commits that added the lines "Commit 8" and "Commit 9"

  Solution: Fork or re-implement cherry pick job without a strategy option, so the user has to resolve the conflict themselves

  

  However, the cherry-pick PR added other ascending lines as well, that were changed on master but don't exist on the support branch, yet.

  

[KerstinKeller]

I will close this PR. We do have the documentation and can take a look again at a later time.