Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: automatically cherry-pick changes from release/candidate #1895

Merged

Conversation

github-actions[bot]
Copy link
Contributor

Cherry pick from the original PR:



PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

We have to manually cherry-pick changes from release/candidate into develop. Which leads to human error and forgotten commits.

Solutions

Porting the work @Garzas has done on Reloaded into Kalium:

Which does:

  • Add a new GitHub workflow that will listen for merged PRs into release/candidate
  • Cherry pick the merge commit
  • Push to a new branch with -cherry-pick suffix
  • Create a new PR with:
    • same assignee
    • same title
    • same body
    • cherry-pick label

Note: When this PR is merged, it will automatically open a PR on develop as well :)


PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

@github-actions github-actions bot added the cherry-pick PR is cherry-picking changes from another banch label Jul 18, 2023
@vitorhugods vitorhugods merged commit 48b43cf into develop Jul 18, 2023
@vitorhugods vitorhugods deleted the ci/automatically-cherry-pick-changes-from-rc-cherry-pick branch July 18, 2023 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant