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

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

Merged
merged 2 commits into from
Aug 4, 2023

Conversation

Garzas
Copy link
Contributor

@Garzas Garzas commented Aug 4, 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?

Copied feature and fix from wireapp/kalium#1942

@Garzas Garzas self-assigned this Aug 4, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 4, 2023

Test Results

512 tests   511 ✔️  34s ⏱️
  74 suites      1 💤
  74 files        0

Results for commit 5b84832.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 4, 2023

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

@AndroidBob
Copy link
Collaborator

Build 904 succeeded.

The build produced the following APK's:

@MohamadJaara MohamadJaara changed the title feat: cp show conflicts feat(CI): display conflicts on cherry-pick action PRs Aug 4, 2023
@AndroidBob
Copy link
Collaborator

Build 907 succeeded.

The build produced the following APK's:

@github-actions
Copy link
Contributor

github-actions bot commented Aug 4, 2023

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

@vitorhugods vitorhugods merged commit 2bfa608 into release/candidate Aug 4, 2023
13 checks passed
@vitorhugods vitorhugods deleted the feat/cp-show-conflicts branch August 4, 2023 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants