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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jul 18, 2023
Merged

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

merged 2 commits into from
Jul 18, 2023

Conversation

vitorhugods
Copy link
Member

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.

Garzas
Garzas approved these changes Jul 18, 2023
View reviewed changes
Copy link
Contributor

@Garzas Garzas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for you feedback and code improvements 🙏 looks awesome! @vitorhugods

@vitorhugods vitorhugods enabled auto-merge (squash) July 18, 2023 14:34
@github-actions
Copy link
Contributor

github-actions bot commented Jul 18, 2023 •
edited
Loading

Unit Test Results

   363 files     363 suites   19s ⏱️
1 934 tests 1 818 ✔️ 116 💤 0 ❌

Results for commit d3caa21.

♻️ This comment has been updated with latest results.

@vitorhugods vitorhugods merged commit 61695e3 into release/candidate Jul 18, 2023
9 checks passed
@vitorhugods vitorhugods deleted the ci/automatically-cherry-pick-changes-from-rc branch July 18, 2023 14:57
github-actions bot pushed a commit that referenced this pull request Jul 18, 2023
@vitorhugods @github-actions
ci: automatically cherry-pick changes from release/candidate (#1894)
10b3130 
Co-authored-by: <Jakub Żerko [email protected]>
(cherry picked from commit 61695e3)
github-actions bot pushed a commit that referenced this pull request Jul 18, 2023
@vitorhugods @github-actions
ci: automatically cherry-pick changes from release/candidate (#1894)
7707c49 
Co-authored-by: <Jakub Żerko [email protected]>
(cherry picked from commit 61695e3)
@github-actions github-actions bot mentioned this pull request Jul 18, 2023
Merged
4 tasks
vitorhugods added a commit that referenced this pull request Jul 18, 2023
@github-actions @vitorhugods
ci: automatically cherry-pick changes from release/candidate (#1894) (#…
48b43cf 
…1895)

Co-authored-by: <Jakub Żerko [email protected]>
(cherry picked from commit 61695e3)

Co-authored-by: Vitor Hugo Schwaab <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MohamadJaara MohamadJaara MohamadJaara approved these changes

@Garzas Garzas Garzas approved these changes

@tmspzz tmspzz Awaiting requested review from tmspzz

@yamilmedina yamilmedina Awaiting requested review from yamilmedina

Assignees

@vitorhugods vitorhugods

Labels
👕 size: S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vitorhugods @MohamadJaara @Garzas