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

github-action: enable merge-queue #12579

Merged
merged 1 commit into from
Feb 6, 2024
Merged

github-action: enable merge-queue #12579

merged 1 commit into from
Feb 6, 2024

Conversation

v1v
Copy link
Member

@v1v v1v commented Feb 6, 2024

Motivation/summary

merge-queue has been enabled but it required some changes in the workflows:

Note: If your repository uses GitHub Actions to perform required checks on pull requests in your repository, you need to update the workflows to include the merge_group event as an additional trigger. Otherwise, status checks will not be triggered when you add a pull request to a merge queue. The merge will fail as the required status check will not be reported. The merge_group event is separate from the pull_request and push events.

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues

@v1v v1v added backport-7.17 Automated backport with mergify to the 7.17 branch backport-8.12 Automated backport with mergify labels Feb 6, 2024
@v1v v1v requested a review from a team February 6, 2024 11:11
@v1v v1v self-assigned this Feb 6, 2024
@v1v v1v requested a review from a team as a code owner February 6, 2024 11:11
@v1v v1v enabled auto-merge February 6, 2024 11:22
@v1v v1v added this pull request to the merge queue Feb 6, 2024
@kruskall kruskall closed this Feb 6, 2024
auto-merge was automatically disabled February 6, 2024 11:41

Pull request was closed

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a manual request Feb 6, 2024
@kruskall kruskall reopened this Feb 6, 2024
@kruskall kruskall added this pull request to the merge queue Feb 6, 2024
@kruskall kruskall removed this pull request from the merge queue due to a manual request Feb 6, 2024
@kruskall kruskall added this pull request to the merge queue Feb 6, 2024
@v1v v1v removed this pull request from the merge queue due to the queue being cleared Feb 6, 2024
@kruskall kruskall merged commit 4312fa7 into elastic:main Feb 6, 2024
16 checks passed
mergify bot pushed a commit that referenced this pull request Feb 6, 2024
@v1v @mergify
github-action: enable merge-queue (#12579)
e3134aa 
(cherry picked from commit 4312fa7)

# Conflicts:
#	.github/workflows/ci-docs.yml
#	.github/workflows/ci.yml
#	.github/workflows/terraform-fmt.yml
mergify bot pushed a commit that referenced this pull request Feb 6, 2024
@v1v @mergify
github-action: enable merge-queue (#12579)
a4e4576 
(cherry picked from commit 4312fa7)
This was referenced Feb 6, 2024
Merged
Merged
mergify bot added a commit that referenced this pull request Feb 6, 2024
@mergify @v1v
github-action: enable merge-queue (#12579) (#12583)
43b11bf 
(cherry picked from commit 4312fa7)

Co-authored-by: Victor Martinez <[email protected]>
mergify bot added a commit that referenced this pull request Feb 6, 2024
@mergify @v1v
[7.17] github-action: enable merge-queue (backport #12579) (#12582)
2a448a9 
* github-action: enable merge-queue (#12579)

(cherry picked from commit 4312fa7)

# Conflicts:
#	.github/workflows/ci-docs.yml
#	.github/workflows/ci.yml
#	.github/workflows/terraform-fmt.yml

* fix conflicts

---------

Co-authored-by: Victor Martinez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reakaleek reakaleek reakaleek approved these changes

@kruskall kruskall kruskall approved these changes

Assignees

@v1v v1v

Labels
backport-7.17 Automated backport with mergify to the 7.17 branch backport-8.12 Automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@v1v @reakaleek @kruskall