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

Use the milli's heed dependency #2228

Merged
merged 6 commits into from
Mar 16, 2022
Merged

Use the milli's heed dependency #2228

merged 6 commits into from
Mar 16, 2022

Conversation

psvnlsaikumar
Copy link
Contributor

@psvnlsaikumar psvnlsaikumar commented Mar 13, 2022 •
edited by irevoire

Pull Request

What does this PR do?

Fixes #2210

This PR (meilisearch/milli#464) is to be merged before approving this.

PR checklist

Please check if your PR fulfills the following requirements:

  • Does this PR fix an existing issue?
  • Have you read the contributing guidelines?
  • Have you made sure that the title is accurate and descriptive of the changes?

Thank you so much for contributing to Meilisearch!

@curquiza curquiza changed the title updates to Use the milli's heed dependency #2210 Use the milli's heed dependency Mar 14, 2022
@curquiza curquiza added this to the v0.27.0 milestone Mar 14, 2022
@curquiza curquiza linked an issue Mar 14, 2022 that may be closed by this pull request
Use the milli's heed dependency #2210
Closed
2 tasks
@psvnlsaikumar
Copy link
Contributor Author

Resolved merge conflicts in PR

@MarinPostma
Copy link
Contributor

hey @psvnlsaikumar ! Thanks so much for contributing! Could you squash all your commits into one please?

@Kerollmops
Copy link
Member

Don't merge that @MarinPostma, at least not before we release version v0.23.1 of milli.

Kerollmops
Kerollmops requested changes Mar 15, 2022
View reviewed changes
meilisearch-auth/Cargo.toml
sha2 = "0.9.6"
meilisearch-error = { path = "../meilisearch-error" }
serde_json = { version = "1.0.67", features = ["preserve_order"] }
time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] }
rand = "0.8.4"
serde = { version = "1.0.130", features = ["derive"] }
thiserror = "1.0.28"
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.22.1" }
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.22.1" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.22.1" }

Copy link
Member

Choose a reason for hiding this comment

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

Could you add a new line here, please? And change the version to v0.23.1, I will release the new version of milli this week.

@MarinPostma
Copy link
Contributor

@psvnlsaikumar, I need this merged ASAP, so what I am gonna do is merge this branch into another branch, make my fixes there, and merge it in main afterward. This way your work will be present in main, while I get my merge on time :)

Thanks again for your contribution :)

@psvnlsaikumar
Copy link
Contributor Author

psvnlsaikumar commented Mar 16, 2022 •
edited

Sure @MarinPostma . That works. I was going to get the work done tonight. But if you are going to take care of it then sure. FYI, the version of milli is to updated once we have the newer version or milli with the recent changes( export of heed) available.

Just for clarification, this PR will not be merged since the changes will be pushed from a seperate PR that you raise, correct?

@MarinPostma
Copy link
Contributor

@psvnlsaikumar yes, that should be done this afternoon

@MarinPostma MarinPostma changed the base branch from main to bump-milli March 16, 2022 12:44
@MarinPostma MarinPostma merged commit bdaf729 into meilisearch:bump-milli Mar 16, 2022
@MarinPostma MarinPostma mentioned this pull request Mar 16, 2022
Merged
bors bot added a commit that referenced this pull request Mar 16, 2022
@bors @psvnlsaikumar
Merge #2244
bb93721 
2244: chore(all): bump milli r=curquiza a=MarinPostma

continues the work initiated by `@psvnlsaikumar` in #2228

Co-authored-by: Sai Kumar <psvnlsaikumar@gmail.com>
@curquiza curquiza mentioned this pull request Mar 16, 2022
Closed
2 tasks
@curquiza curquiza added the v0.27.0 PRs/issues solved in v0.27.0 label Aug 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kerollmops Kerollmops Kerollmops requested changes

Assignees
No one assigned
Labels
v0.27.0 PRs/issues solved in v0.27.0
Projects
None yet
Milestone
v0.27.0
Development

Successfully merging this pull request may close these issues.

Use the milli's heed dependency
4 participants
@psvnlsaikumar @MarinPostma @Kerollmops @curquiza