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

[npm] upgrade elastic/maki #60829

Merged
merged 1 commit into from
Mar 22, 2020
Merged

[npm] upgrade elastic/maki #60829

merged 1 commit into from
Mar 22, 2020

Conversation

spalger
Copy link
Contributor

@spalger spalger commented Mar 20, 2020

In order to help unblock #59972 we need to remove the const statement from @elastic/maki, so time to upgrade to 6.2.

@spalger spalger added [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.7.0 labels Mar 20, 2020
@spalger spalger requested a review from nickpeihl March 20, 2020 21:59
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-gis (Team:Geo)

nickpeihl
nickpeihl approved these changes Mar 20, 2020
View reviewed changes
Copy link
Member

@nickpeihl nickpeihl left a comment

Choose a reason for hiding this comment

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

lgtm. tested in chrome

@nreese
Copy link
Contributor

nreese commented Mar 20, 2020

What does this mean for the generated icon set? Does 6.2 contain new icons? Do we need to rebuild something?

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

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

@nickpeihl
Copy link
Member

What does this mean for the generated icon set? Does 6.2 contain new icons? Do we need to rebuild something?

No new icons or need to rebuild anything. The generated icons remain the same. The only changes were elastic/maki#7 and some dependency updates.

@nreese
Copy link
Contributor

nreese commented Mar 21, 2020 •
edited
Loading

got it. So we upgraded our maki version number but now we are out of sync with maki release 6.2. Maybe we should make a 6.1.2 or some patch so our version numbers stay inline with maki?

@spalger
Copy link
Contributor Author

spalger commented Mar 22, 2020

@nreese I'm not sure about staying inline with maki, but we already had a couple versions which had some issues and I switched to a minor upgrade because we removed a dev dependency that wasn't actually published online... Either way, these versions are already on npm so we can't really go back now so I'm going to move forward and we can submit another PR to Kibana if we adjust course in @elastic/maki.

@spalger spalger merged commit 33af1c1 into elastic:master Mar 22, 2020
@spalger spalger mentioned this pull request Mar 22, 2020
Merged
spalger added a commit to spalger/kibana that referenced this pull request Mar 22, 2020
@spalger
[npm] upgrade elastic/maki (elastic#60829)
5630017 
Co-authored-by: spalger <spalger@users.noreply.github.com>
spalger added a commit that referenced this pull request Mar 22, 2020
@spalger
[7.x] [npm] upgrade elastic/maki (#60829) (#60862)
55cbd5d 
Co-authored-by: spalger <spalger@users.noreply.github.com>

Co-authored-by: spalger <spalger@users.noreply.github.com>
@spalger
Copy link
Contributor Author

spalger commented Mar 22, 2020

7.x/7.7: 55cbd5d

@spalger spalger deleted the upgrade/elastic-maki branch March 22, 2020 22:00
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 23, 2020
@gmmorris
Merge branch 'master' into alerting/tls-warning
6230180 
* master: (39 commits)
  [APM]Create custom link from Trace summary (elastic#59648)
  [ML] Fixing app clean up (elastic#60853)
  [SIEM] Use ECS categorisation for Authentication widgets (elastic#60734)
  [NP] Remove kbnUrl usage in discover/dashboard/visualize (elastic#60016)
  Skip failing test
  [Uptime]Update fetch effect failed action handling (elastic#60742)
  [npm] upgrade elastic/maki (elastic#60829)
  [Uptime] Add Settings Page (elastic#53550)
  [APM] service maps: avoid unnecesary `useDeepObjectIdentity` (elastic#60836)
  [Index management] Re-enable index template tests (elastic#60780)
  Fixed UI/UX issues: alerts delete confirmation, combobox behaviors (elastic#60703)
  [SIEM] Fix patching of ML Rules (elastic#60830)
  [APM] Service Map - Separate overlapping edges by rotating nodes (elastic#60477)
  [Alerting] fix flaky test for index threshold grouping (elastic#60792)
  [SIEM][Detection Engine] Adds test scripts for machine learning feature
  Flatten child api response for resolver (elastic#60810)
  Change "url" to "urls" in APM agent instructions (elastic#60790)
  [DOCS] Updates API requests and examples (elastic#60695)
  [SIEM] [Cases] Create case from timeline (elastic#60711)
  [Lens] Resetting a layer generates new suggestions (elastic#60674)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickpeihl nickpeihl nickpeihl approved these changes

Assignees
No one assigned
Labels
[Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation release_note:skip Skip the PR/issue when compiling release notes v7.7.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@spalger @elasticmachine @nreese @kibanamachine @nickpeihl