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

feat(CI): display conflicts on cherry-pick action PRs #2063

Merged
merged 2 commits into from
Aug 7, 2023
Merged

feat(CI): display conflicts on cherry-pick action PRs #2063

merged 2 commits into from
Aug 7, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 4, 2023

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 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?

Copied feature and fix from wireapp/kalium#1942

@github-actions github-actions bot added the cherry-pick PR is cherry-picking changes from another banch label Aug 4, 2023
@Garzas Garzas mentioned this pull request Aug 4, 2023
Closed
4 tasks
@Garzas Garzas requested review from yamilmedina, a team, alexandreferris, borichellow, mchenani and saleniuk and removed request for a team August 4, 2023 10:13
@AndroidBob
Copy link
Collaborator

Build 916 succeeded.

The build produced the following APK's:

@Garzas Garzas enabled auto-merge August 7, 2023 10:29
@Garzas Garzas added this pull request to the merge queue Aug 7, 2023
@github-actions
Copy link
Contributor Author

github-actions bot commented Aug 7, 2023

Test Results

508 tests  ±0   507 ✔️ ±0   5m 7s ⏱️ - 1m 19s
  77 suites ±0       1 💤 ±0 
  77 files   ±0       0 ❌ ±0 

Results for commit c9f9f54. ± Comparison against base commit 37bbf63.

@github-actions
Copy link
Contributor Author

github-actions bot commented Aug 7, 2023

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

Merged via the queue into develop with commit b875f2b Aug 7, 2023
8 checks passed
@Garzas Garzas deleted the feat/cp-show-conflicts-cherry-pick branch August 7, 2023 11:03
@AndroidBob
Copy link
Collaborator

Build 931 succeeded.

The build produced the following APK's:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vitorhugods vitorhugods vitorhugods approved these changes

@alexandreferris alexandreferris alexandreferris approved these changes

@yamilmedina yamilmedina Awaiting requested review from yamilmedina

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

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

@saleniuk saleniuk Awaiting requested review from saleniuk saleniuk 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.
4 participants
@AndroidBob @alexandreferris @vitorhugods @Garzas