Skip to content

Conversation

watson
Copy link
Contributor

@watson watson commented Feb 1, 2023

Previously a custom diff of the files inside the upstream spec directory was kept up-to-date in this package .patches directory. This process was very tedious and wasn't providing much value.

In this PR I've simplified the process tremendously and simply rely on checking if there are any new commits upstream and then allow the developer to manually check for relevant changes. This is something they needed to do with the old system regardless. Here the code is just much simpler.

@watson watson added release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor labels Feb 1, 2023
@watson watson self-assigned this Feb 1, 2023
@watson watson requested review from a team as code owners February 1, 2023 11:05
Copy link
Member

@azasypkin azasypkin left a comment

Choose a reason for hiding this comment

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

LGTM! Just few minor nits.

Co-authored-by: Aleh Zasypkin <aleh.zasypkin@gmail.com>
@watson watson enabled auto-merge (squash) February 2, 2023 08:54
@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Metrics [docs]

✅ unchanged

History

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

cc @watson

@watson watson merged commit 9754529 into elastic:main Feb 2, 2023
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Feb 2, 2023
…lastic#150024)

Previously a custom diff of the files inside the upstream `spec`
directory was kept up-to-date in this package `.patches` directory. This
process was very tedious and wasn't providing much value.

In this commit I've simplified the process tremendously and simply rely on
checking if there are any new commits upstream and then allow the
developer to manually check for relevant changes. This is something they
needed to do with the old system regardless. Here the code is just much
simpler.

---------

Co-authored-by: Aleh Zasypkin <aleh.zasypkin@gmail.com>
(cherry picked from commit 9754529)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.6

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

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Feb 2, 2023
…red (#150024) (#150142)

# Backport

This will backport the following commits from `main` to `8.6`:
- [[@kbn/handlebars] Simplify the way upstream changes are discovered
(#150024)](#150024)

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

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

<!--BACKPORT [{"author":{"name":"Thomas
Watson","email":"watson@elastic.co"},"sourceCommit":{"committedDate":"2023-02-02T09:56:56Z","message":"[@kbn/handlebars]
Simplify the way upstream changes are discovered (#150024)\n\nPreviously
a custom diff of the files inside the upstream `spec`\r\ndirectory was
kept up-to-date in this package `.patches` directory. This\r\nprocess
was very tedious and wasn't providing much value.\r\n\r\nIn this commit
I've simplified the process tremendously and simply rely on\r\nchecking
if there are any new commits upstream and then allow the\r\ndeveloper to
manually check for relevant changes. This is something they\r\nneeded to
do with the old system regardless. Here the code is just
much\r\nsimpler.\r\n\r\n---------\r\n\r\nCo-authored-by: Aleh Zasypkin
<aleh.zasypkin@gmail.com>","sha":"975452987919dff1dbfc1ae48100763385c09c36","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:prev-minor","v8.7.0"],"number":150024,"url":"https://github.com/elastic/kibana/pull/150024","mergeCommit":{"message":"[@kbn/handlebars]
Simplify the way upstream changes are discovered (#150024)\n\nPreviously
a custom diff of the files inside the upstream `spec`\r\ndirectory was
kept up-to-date in this package `.patches` directory. This\r\nprocess
was very tedious and wasn't providing much value.\r\n\r\nIn this commit
I've simplified the process tremendously and simply rely on\r\nchecking
if there are any new commits upstream and then allow the\r\ndeveloper to
manually check for relevant changes. This is something they\r\nneeded to
do with the old system regardless. Here the code is just
much\r\nsimpler.\r\n\r\n---------\r\n\r\nCo-authored-by: Aleh Zasypkin
<aleh.zasypkin@gmail.com>","sha":"975452987919dff1dbfc1ae48100763385c09c36"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/150024","number":150024,"mergeCommit":{"message":"[@kbn/handlebars]
Simplify the way upstream changes are discovered (#150024)\n\nPreviously
a custom diff of the files inside the upstream `spec`\r\ndirectory was
kept up-to-date in this package `.patches` directory. This\r\nprocess
was very tedious and wasn't providing much value.\r\n\r\nIn this commit
I've simplified the process tremendously and simply rely on\r\nchecking
if there are any new commits upstream and then allow the\r\ndeveloper to
manually check for relevant changes. This is something they\r\nneeded to
do with the old system regardless. Here the code is just
much\r\nsimpler.\r\n\r\n---------\r\n\r\nCo-authored-by: Aleh Zasypkin
<aleh.zasypkin@gmail.com>","sha":"975452987919dff1dbfc1ae48100763385c09c36"}}]}]
BACKPORT-->

Co-authored-by: Thomas Watson <watson@elastic.co>
kqualters-elastic pushed a commit to kqualters-elastic/kibana that referenced this pull request Feb 6, 2023
…lastic#150024)

Previously a custom diff of the files inside the upstream `spec`
directory was kept up-to-date in this package `.patches` directory. This
process was very tedious and wasn't providing much value.

In this commit I've simplified the process tremendously and simply rely on
checking if there are any new commits upstream and then allow the
developer to manually check for relevant changes. This is something they
needed to do with the old system regardless. Here the code is just much
simpler.

---------

Co-authored-by: Aleh Zasypkin <aleh.zasypkin@gmail.com>
@watson watson deleted the handlebars-ci branch February 6, 2023 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes v8.6.2 v8.7.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants