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: merge group triggering twice and incorrect for RC (WPB-8645) #3213

Merged
merged 4 commits into from
Jul 22, 2024
Merged

fix: merge group triggering twice and incorrect for RC (WPB-8645) #3213

merged 4 commits into from
Jul 22, 2024

Conversation

yamilmedina
Copy link
Contributor

@yamilmedina yamilmedina commented Jul 22, 2024 •
edited by github-actions bot
Loading

EpicWPB-8645 [Android] Infrastructure code and developer experience

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

Merge queues are triggering twice the workflow for building develop, and is incorrect for RC, since we must trigger rc workflow for rc

Causes (Optional)

Merge queue was enabled for RC, so we now have 2 merge queues

Solutions

Specify the merge_group branch parameter, so merge queues are triggered when expected

Attachments

Screenshot 2024-07-22 at 10 52 26

PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.
References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

@yamilmedina yamilmedina self-assigned this Jul 22, 2024
@yamilmedina yamilmedina requested review from borichellow, vitorhugods and saleniuk and removed request for a team July 22, 2024 09:00
@yamilmedina yamilmedina added this pull request to the merge queue Jul 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-staging-release-pr-3213.apk is available for download

@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-internal-compat-pr-3213.apk is available for download

@yamilmedina yamilmedina removed this pull request from the merge queue due to a manual request Jul 22, 2024
@yamilmedina yamilmedina added this pull request to the merge queue Jul 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-staging-release-pr-3213.apk is available for download

@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-internal-compat-pr-3213.apk is available for download

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jul 22, 2024
@yamilmedina yamilmedina added this pull request to the merge queue Jul 22, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jul 22, 2024
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jul 22, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@yamilmedina yamilmedina merged commit 3321e26 into release/candidate Jul 22, 2024
9 of 11 checks passed
@yamilmedina yamilmedina deleted the ci/fix-merge-queue-config branch July 22, 2024 12:25
github-actions bot pushed a commit that referenced this pull request Jul 22, 2024
@yamilmedina @github-actions
fix: merge group triggering twice and incorrect for RC (WPB-8645) (#3213
0244412 
)
@github-actions github-actions bot mentioned this pull request Jul 22, 2024
Merged
6 tasks
@echoes-hq echoes-hq bot added the echoes: unplanned Any work item that isn’t part of the product or technical roadmap. label Jul 22, 2024
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

@vitorhugods vitorhugods vitorhugods approved these changes

@MohamadJaara MohamadJaara MohamadJaara approved these changes

@alexandreferris alexandreferris alexandreferris approved these changes

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

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

Assignees

@yamilmedina yamilmedina

Labels
echoes: unplanned Any work item that isn’t part of the product or technical roadmap. size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@yamilmedina @alexandreferris @MohamadJaara @vitorhugods @Garzas