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

[Security Solution] [Fix] Conflicting PRs caused check types to fail on main #155746

Merged
merged 3 commits into from
Apr 25, 2023
Merged

[Security Solution] [Fix] Conflicting PRs caused check types to fail on main #155746

merged 3 commits into from
Apr 25, 2023

Conversation

logeekal
Copy link
Contributor

Summary

This build was failing after the PR - [Security solution] Mocks and Unit tests for Alert Page controls #155508 was merged on main.

This happened because in between CI passed all checks and PR was merged, there was another PR merge which had some conflicting type. It caused CI to break on main.

@logeekal logeekal added Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. Team:Threat Hunting:Investigations Security Solution Investigations Team labels Apr 25, 2023
@logeekal logeekal marked this pull request as ready for review April 25, 2023 16:29
@logeekal logeekal requested a review from a team as a code owner April 25, 2023 16:29
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-solution (Team: SecuritySolution)

@logeekal logeekal added the release_note:skip Skip the PR/issue when compiling release notes label Apr 25, 2023
@logeekal logeekal enabled auto-merge (squash) April 25, 2023 16:48
@logeekal logeekal changed the title [Security Solution] [Fix] Conflicting PRs caused check types to fail on main,, [Security Solution] [Fix] Conflicting PRs caused check types to fail on main Apr 25, 2023
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
securitySolution 9.1MB 9.1MB +24.0B
Unknown metric groups

ESLint disabled line counts

id before after diff
enterpriseSearch 17 19 +2
securitySolution 397 400 +3
total +5

Total ESLint disabled count

id before after diff
enterpriseSearch 18 20 +2
securitySolution 477 480 +3
total +5

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@logeekal logeekal merged commit af3ed7b into elastic:main Apr 25, 2023
@kibanamachine kibanamachine added v8.8.0 backport:skip This commit does not require backporting labels Apr 25, 2023
@demjened demjened mentioned this pull request Apr 25, 2023
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrew-goldstein andrew-goldstein andrew-goldstein approved these changes

Assignees
No one assigned
Labels
backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. Team:Threat Hunting:Investigations Security Solution Investigations Team v8.8.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@logeekal @elasticmachine @kibana-ci @andrew-goldstein @kibanamachine