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

Bump [email protected] #161630

Merged
merged 7 commits into from
Jul 15, 2023
Merged

Bump [email protected] #161630

merged 7 commits into from
Jul 15, 2023

Conversation

patrykkopycinski
Copy link
Contributor

@patrykkopycinski patrykkopycinski commented Jul 11, 2023 •
edited by kibanamachine
Loading

Summary

Bump [email protected] and resolve duplicated jest-related dependencies

@patrykkopycinski patrykkopycinski marked this pull request as ready for review July 12, 2023 07:45
@patrykkopycinski patrykkopycinski requested review from a team as code owners July 12, 2023 07:45
@patrykkopycinski patrykkopycinski requested a review from maximpn July 12, 2023 07:45
@patrykkopycinski patrykkopycinski self-assigned this Jul 12, 2023
@botelastic botelastic bot added the Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability label Jul 12, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/uptime (Team:uptime)

@patrykkopycinski patrykkopycinski added release_note:skip Skip the PR/issue when compiling release notes and removed Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability labels Jul 12, 2023
jughosta
jughosta approved these changes Jul 12, 2023
View reviewed changes
Copy link
Contributor

@jughosta jughosta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Data Discovery changes LGTM 👍

@botelastic botelastic bot added the Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability label Jul 12, 2023
CoenWarmer
CoenWarmer approved these changes Jul 12, 2023
View reviewed changes
Copy link
Contributor

@CoenWarmer CoenWarmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AO changes LGTM

thomheymann
thomheymann approved these changes Jul 12, 2023
View reviewed changes
Copy link
Contributor

@thomheymann thomheymann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security changes LGTM

pgayvallet
pgayvallet approved these changes Jul 12, 2023
View reviewed changes
Copy link
Contributor

@pgayvallet pgayvallet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for Core changes

cnasikas
cnasikas approved these changes Jul 12, 2023
View reviewed changes
Copy link
Member

@cnasikas cnasikas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ResponseOps changes LTGM

nreese
nreese approved these changes Jul 12, 2023
View reviewed changes
Copy link
Contributor

@nreese nreese left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kibana-gis changes LGTM
code review only

@banderror banderror requested review from dplumlee and removed request for maximpn July 13, 2023 08:37
dplumlee
dplumlee approved these changes Jul 13, 2023
View reviewed changes
Copy link
Contributor

@dplumlee dplumlee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rules management changes lgtm

opauloh
opauloh approved these changes Jul 14, 2023
View reviewed changes
Copy link
Contributor

@opauloh opauloh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

csp lgtm

markov00
markov00 approved these changes Jul 14, 2023
View reviewed changes
Copy link
Member

@markov00 markov00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM changes are applied to bring back the original behavior of the restoreAllMocks and resetAllMocks in jest 29.4.3.
Feels like a safe change.

@Ikuni17 Ikuni17 added the backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development label Jul 14, 2023
@Ikuni17
Copy link
Contributor

Ikuni17 commented Jul 14, 2023

@patrykkopycinski Thanks for doing this! I've added the backport:prev-MAJOR label because jest is a dependency the operations team is trying to keep in sync on main and 7.x.

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

cc @patrykkopycinski

@patrykkopycinski patrykkopycinski merged commit b2b7cf6 into elastic:main Jul 15, 2023
@patrykkopycinski patrykkopycinski deleted the chore/jest-29-6-1 branch July 15, 2023 15:42
@kibanamachine kibanamachine mentioned this pull request Jul 15, 2023
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jul 15, 2023
@patrykkopycinski
Bump [email protected] (elastic#161630)
2de3d60 
## Summary

Bump `[email protected]` and resolve duplicated jest-related dependencies

---------

Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit b2b7cf6)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
❌ 7.17 Backport failed because of merge conflicts

You might need to backport the following PRs to 7.17:
- [Reporting] Promote selected tests as integration tests (#121903)
✅ 8.9

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 161630

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Jul 15, 2023
@kibanamachine @patrykkopycinski
[8.9] Bump [email protected] (#161630) (#162008)
d3e1266 
# Backport

This will backport the following commits from `main` to `8.9`:
- [Bump [email protected]
(#161630)](#161630)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Patryk
Kopyciński","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-07-15T15:42:30Z","message":"Bump
[email protected] (#161630)\n\n## Summary\r\n\r\nBump `[email protected]` and
resolve duplicated jest-related
dependencies\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"b2b7cf6253252be011198feda6f04d892cfc5515","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:uptime","release_note:skip","backport:prev-MAJOR","v8.10.0"],"number":161630,"url":"https://github.com/elastic/kibana/pull/161630","mergeCommit":{"message":"Bump
[email protected] (#161630)\n\n## Summary\r\n\r\nBump `[email protected]` and
resolve duplicated jest-related
dependencies\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"b2b7cf6253252be011198feda6f04d892cfc5515"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/161630","number":161630,"mergeCommit":{"message":"Bump
[email protected] (#161630)\n\n## Summary\r\n\r\nBump `[email protected]` and
resolve duplicated jest-related
dependencies\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"b2b7cf6253252be011198feda6f04d892cfc5515"}}]}]
BACKPORT-->

Co-authored-by: Patryk Kopyciński <[email protected]>
@patrykkopycinski patrykkopycinski mentioned this pull request Jul 16, 2023
Merged
@patrykkopycinski
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
✅ 7.17

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

patrykkopycinski added a commit that referenced this pull request Jul 17, 2023
@patrykkopycinski
[7.17] Bump [email protected] (#161630) (#162012)
376c1cd 
# Backport

This will backport the following commits from `main` to `7.17`:
- [Bump [email protected]
(#161630)](#161630)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Patryk
Kopyciński","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-07-15T15:42:30Z","message":"Bump
[email protected] (#161630)\n\n## Summary\r\n\r\nBump `[email protected]` and
resolve duplicated jest-related
dependencies\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"b2b7cf6253252be011198feda6f04d892cfc5515","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:uptime","release_note:skip","backport:prev-MAJOR","v8.9.0","v8.10.0"],"number":161630,"url":"https://github.com/elastic/kibana/pull/161630","mergeCommit":{"message":"Bump
[email protected] (#161630)\n\n## Summary\r\n\r\nBump `[email protected]` and
resolve duplicated jest-related
dependencies\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"b2b7cf6253252be011198feda6f04d892cfc5515"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"8.9","label":"v8.9.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/162008","number":162008,"state":"MERGED","mergeCommit":{"sha":"d3e1266850f2a6f03ce2fbe05a4732218d11e1f8","message":"[8.9]
Bump [email protected] (#161630) (#162008)\n\n# Backport\n\nThis will backport
the following commits from `main` to `8.9`:\n- [Bump
[email protected]\n(#161630)](https://github.com/elastic/kibana/pull/161630)\n\n<!---
Backport version: 8.9.7 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Patryk\nKopyciński\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2023-07-15T15:42:30Z\",\"message\":\"Bump\[email protected]
(#161630)\\n\\n## Summary\\r\\n\\r\\nBump `[email protected]` and\nresolve
duplicated
jest-related\ndependencies\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:
kibanamachine\n<[email protected]>\",\"sha\":\"b2b7cf6253252be011198feda6f04d892cfc5515\",\"branchLabelMapping\":{\"^v8.10.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:uptime\",\"release_note:skip\",\"backport:prev-MAJOR\",\"v8.10.0\"],\"number\":161630,\"url\":\"https://github.com/elastic/kibana/pull/161630\",\"mergeCommit\":{\"message\":\"Bump\[email protected]
(#161630)\\n\\n## Summary\\r\\n\\r\\nBump `[email protected]` and\nresolve
duplicated
jest-related\ndependencies\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:
kibanamachine\n<[email protected]>\",\"sha\":\"b2b7cf6253252be011198feda6f04d892cfc5515\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v8.10.0\",\"labelRegex\":\"^v8.10.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/161630\",\"number\":161630,\"mergeCommit\":{\"message\":\"Bump\[email protected]
(#161630)\\n\\n## Summary\\r\\n\\r\\nBump `[email protected]` and\nresolve
duplicated
jest-related\ndependencies\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:
kibanamachine\n<[email protected]>\",\"sha\":\"b2b7cf6253252be011198feda6f04d892cfc5515\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Patryk Kopyciński
<[email protected]>"}},{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/161630","number":161630,"mergeCommit":{"message":"Bump
[email protected] (#161630)\n\n## Summary\r\n\r\nBump `[email protected]` and
resolve duplicated jest-related
dependencies\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"b2b7cf6253252be011198feda6f04d892cfc5515"}}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dplumlee dplumlee dplumlee approved these changes

@opauloh opauloh opauloh approved these changes

@cnasikas cnasikas cnasikas approved these changes

@Dosant Dosant Dosant approved these changes

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

@thomheymann thomheymann thomheymann approved these changes

@pgayvallet pgayvallet pgayvallet approved these changes

@markov00 markov00 markov00 approved these changes

@jughosta jughosta jughosta approved these changes

@CoenWarmer CoenWarmer CoenWarmer approved these changes

@nreese nreese nreese approved these changes

@vitaliidm vitaliidm vitaliidm approved these changes

@shahzad31 shahzad31 shahzad31 approved these changes

Assignees

@patrykkopycinski patrykkopycinski

Labels
backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development release_note:skip Skip the PR/issue when compiling release notes Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability v7.17.12 v8.9.0 v8.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.