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

fix: multiple merge conflicts #2419

Merged
merged 2 commits into from
Nov 14, 2023
Merged

fix: multiple merge conflicts #2419

merged 2 commits into from
Nov 14, 2023

Conversation

AndroidBob
Copy link
Collaborator

Cherry pick from the original PR:

⚠️ Conflicts during cherry-pick:
kalium

PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like
    • 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

When there was more than one merge conflict automatic cherry pick failed

Solutions

  • Use awk to set the Output Record Separator (ORS) to
    , which echo -e in bash can interpret as a newline
  • Pipe the output to sed to replace the last
    with
    , to don't end up with an extra newline at the end.
  • Move PR_BODY to script to handle properly variable formatting

@AndroidBob AndroidBob added the cherry-pick PR is cherry-picking changes from another banch label Nov 13, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 13, 2023 •
edited
Loading

Test Results

680 tests  ±0   680 ✔️ ±0   10m 33s ⏱️ + 2m 9s
  98 suites ±0       0 💤 ±0 
  98 files   ±0       0 ❌ ±0 

Results for commit 0fdcb65. ± Comparison against base commit d0404eb.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@Garzas Garzas requested review from a team, alexandreferris, borichellow, vitorhugods, mchenani and Garzas and removed request for a team November 13, 2023 13:10
@github-actions GitHub Actions
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@AndroidBob
Copy link
Collaborator Author

Build 1780 succeeded.

The build produced the following APK's:

@Garzas Garzas added this pull request to the merge queue Nov 14, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 14, 2023
@Garzas Garzas added this pull request to the merge queue Nov 14, 2023
Merged via the queue into develop with commit ee5105c Nov 14, 2023
11 of 12 checks passed
@Garzas Garzas deleted the fix/cherry-pick-conflicts-cherry-pick branch November 14, 2023 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Garzas Garzas Garzas approved these changes

@alexandreferris alexandreferris alexandreferris approved these changes

@borichellow borichellow Awaiting requested review from borichellow borichellow was automatically assigned from wireapp/android

@vitorhugods vitorhugods Awaiting requested review from vitorhugods vitorhugods was automatically assigned from wireapp/android

@mchenani mchenani Awaiting requested review from mchenani mchenani was automatically assigned from wireapp/android

Assignees

@Garzas Garzas

Labels
cherry-pick PR is cherry-picking changes from another banch size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AndroidBob @alexandreferris @Garzas