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

[Renovate/Core] Use prev-minor backport strategy #204709

Merged
merged 2 commits into from
Dec 19, 2024

Conversation

afharo
Copy link
Member

@afharo afharo commented Dec 18, 2024

Summary

Speaking to @azasypkin, we noticed that we are not backporting many of our dependency updates. These were mostly set to backport:skip before the 9 vs. 8.x branch split. But we need it at the moment.

We'll need to revisit our backport strategy once we release 9.0.

Identify risks

  • Some deps like @elastic/elasticsearch might be bumped to 9.0 and shouldn't be backported. We'll update the renovate file when that occurs.

@afharo afharo self-assigned this Dec 18, 2024
@afharo afharo requested review from a team December 18, 2024 10:24
@afharo afharo added release_note:skip Skip the PR/issue when compiling release notes backport:skip This commit does not require backporting backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! dependencies Pull requests that update a dependency file and removed backport:skip This commit does not require backporting labels Dec 18, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-security (Team:Security)

@afharo afharo enabled auto-merge (squash) December 18, 2024 13:06
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @afharo

@afharo afharo merged commit 997884e into elastic:main Dec 19, 2024
9 checks passed
@afharo afharo deleted the core-renovate-prev-minor branch December 19, 2024 10:02
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/12410433487

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.x Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 204709

Questions ?

Please refer to the Backport tool documentation

@@ -519,7 +519,7 @@
],
"labels": [
"release_note:skip",
"backport:skip",
"backport:prev-minor",
Copy link
Member

Choose a reason for hiding this comment

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

question: Sorry, I always forget what our labels mean 🙂. If we merge something into the main branch now, which is 9.0, is prev-minor essentially equivalent to backport:skip since there is no prev-minor for 9.0?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's confusing, but AFAIK, prev-minor ships it to 8.x at the moment.

The labels' descriptions explain the targets to each one of them (source):
image

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I see, nice, thanks!

@afharo
Copy link
Member Author

afharo commented Dec 19, 2024

💚 All backports created successfully

Status Branch Result
8.x

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

Questions ?

Please refer to the Backport tool documentation

afharo added a commit that referenced this pull request Dec 19, 2024
…204909)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Renovate/Core] Use `prev-minor` backport strategy
(#204709)](#204709)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Alejandro Fernández
Haro","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-19T10:02:46Z","message":"[Renovate/Core]
Use `prev-minor` backport strategy (#204709)\n\n## Summary\n\nSpeaking
to @azasypkin, we noticed that we are not backporting many of\nour
dependency updates. These were mostly set to `backport:skip` before\nthe
9 vs. 8.x branch split. But we need it at the moment.\n\nWe'll need to
revisit our backport strategy once we release 9.0.\n\n### Identify
risks\n\n- [ ] Some deps like `@elastic/elasticsearch` might be bumped
to 9.0 and\nshouldn't be backported. We'll update the renovate file when
that\noccurs.","sha":"997884e1ba14a4e68647f13b90b7a9337c20d35a","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","Team:Security","release_note:skip","dependencies","v9.0.0","backport:prev-minor"],"number":204709,"url":"https://github.com/elastic/kibana/pull/204709","mergeCommit":{"message":"[Renovate/Core]
Use `prev-minor` backport strategy (#204709)\n\n## Summary\n\nSpeaking
to @azasypkin, we noticed that we are not backporting many of\nour
dependency updates. These were mostly set to `backport:skip` before\nthe
9 vs. 8.x branch split. But we need it at the moment.\n\nWe'll need to
revisit our backport strategy once we release 9.0.\n\n### Identify
risks\n\n- [ ] Some deps like `@elastic/elasticsearch` might be bumped
to 9.0 and\nshouldn't be backported. We'll update the renovate file when
that\noccurs.","sha":"997884e1ba14a4e68647f13b90b7a9337c20d35a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204709","number":204709,"mergeCommit":{"message":"[Renovate/Core]
Use `prev-minor` backport strategy (#204709)\n\n## Summary\n\nSpeaking
to @azasypkin, we noticed that we are not backporting many of\nour
dependency updates. These were mostly set to `backport:skip` before\nthe
9 vs. 8.x branch split. But we need it at the moment.\n\nWe'll need to
revisit our backport strategy once we release 9.0.\n\n### Identify
risks\n\n- [ ] Some deps like `@elastic/elasticsearch` might be bumped
to 9.0 and\nshouldn't be backported. We'll update the renovate file when
that\noccurs.","sha":"997884e1ba14a4e68647f13b90b7a9337c20d35a"}}]}]
BACKPORT-->
JoseLuisGJ pushed a commit to JoseLuisGJ/kibana that referenced this pull request Dec 19, 2024
## Summary

Speaking to @azasypkin, we noticed that we are not backporting many of
our dependency updates. These were mostly set to `backport:skip` before
the 9 vs. 8.x branch split. But we need it at the moment.

We'll need to revisit our backport strategy once we release 9.0.

### Identify risks

- [ ] Some deps like `@elastic/elasticsearch` might be bumped to 9.0 and
shouldn't be backported. We'll update the renovate file when that
occurs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) dependencies Pull requests that update a dependency file release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! v8.18.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants