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

fix: cherry pick conflicts #2214

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Conversation

github-actions[bot]
Copy link
Contributor

Cherry pick from the original PR:


⚠️ Conflicts during cherry-pick:


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

@github-actions github-actions bot added the cherry-pick PR is cherry-picking changes from another banch label Nov 10, 2023
@Garzas Garzas requested review from a team, alexandreferris, borichellow, MohamadJaara, vitorhugods and ohassine and removed request for a team November 10, 2023 01:43
Copy link
Contributor Author

github-actions bot commented Nov 13, 2023

Unit Test Results

   470 files  +  86     470 suites  +86   2m 36s ⏱️ + 2m 18s
2 622 tests +601  2 518 ✔️ +539  104 💤 +62  0 ±0 

Results for commit be2dec4. ± Comparison against base commit 8e2301b.

♻️ This comment has been updated with latest results.

@Garzas Garzas added this pull request to the merge queue Nov 13, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #2214 (be2dec4) into develop (8e2301b) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@              Coverage Diff              @@
##             develop    #2214      +/-   ##
=============================================
- Coverage      58.02%   58.01%   -0.01%     
  Complexity        21       21              
=============================================
  Files           1070     1070              
  Lines          40701    40701              
  Branches        3766     3766              
=============================================
- Hits           23615    23612       -3     
- Misses         15468    15470       +2     
- Partials        1618     1619       +1     

see 2 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8e2301b...be2dec4. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/cherry-pick-conflicts-cherry-pick
Commit report: bebd0bb

kalium-jvm: 0 Failed, 0 New Flaky, 2518 Passed, 104 Skipped, 7m 6.04s Wall Time

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 13, 2023
@Garzas Garzas added this pull request to the merge queue Nov 13, 2023
Merged via the queue into develop with commit b1cb22e Nov 13, 2023
17 checks passed
@Garzas Garzas deleted the fix/cherry-pick-conflicts-cherry-pick branch November 13, 2023 07:18
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 👕 size: XS type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants