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 #2213

Merged
merged 3 commits into from
Nov 10, 2023
Merged

Conversation

Garzas
Copy link
Contributor

@Garzas Garzas commented Nov 9, 2023


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 SQPIT-764
    • 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 \n, which echo -e in bash can interpret as a newline
  • Pipe the output to sed to replace the last \n with \n, to don't end up with an extra newline at the end.
  • Move PR_BODY to script to handle properly variable formatting

Copy link
Contributor

github-actions bot commented Nov 9, 2023

Unit Test Results

   413 files     413 suites   37s ⏱️
2 272 tests 2 152 ✔️ 120 💤 0

Results for commit abb45ea.

♻️ This comment has been updated with latest results.

@codecov-commenter
Copy link

codecov-commenter commented Nov 9, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release/candidate@1f72f19). Click here to learn what that means.
The diff coverage is n/a.

@@                 Coverage Diff                  @@
##             release/candidate    #2213   +/-   ##
====================================================
  Coverage                     ?   58.24%           
  Complexity                   ?       21           
====================================================
  Files                        ?     1011           
  Lines                        ?    37820           
  Branches                     ?     3452           
====================================================
  Hits                         ?    22028           
  Misses                       ?    14319           
  Partials                     ?     1473           

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 1f72f19...abb45ea. Read the comment docs.

@datadog-wireapp
Copy link

datadog-wireapp bot commented Nov 9, 2023

Datadog Report

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

kalium-jvm: 0 Failed, 0 New Flaky, 2269 Passed, 98 Skipped, 13m 13s Wall Time

@Garzas Garzas enabled auto-merge (squash) November 10, 2023 00:16
@Garzas Garzas merged commit 1321a90 into release/candidate Nov 10, 2023
14 checks passed
@Garzas Garzas deleted the fix/cherry-pick-conflicts branch November 10, 2023 00:55
github-actions bot pushed a commit that referenced this pull request Nov 10, 2023
@github-actions github-actions bot mentioned this pull request Nov 10, 2023
4 tasks
github-merge-queue bot pushed a commit that referenced this pull request Nov 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants