Skip to content

Commit

Permalink
Merge #128
Browse files Browse the repository at this point in the history
128: Changes related to the next Meilisearch release (v0.27.0) r=bidoubiwa a=meili-bot

This PR gathers the changes related to the next Meilisearch release (v0.27.0) so that this package is ready when the official release is out.

⚠️ This PR should NOT be merged until:
  - the next release of Meilisearch (v0.27.0) is out.
  - the [`meilisearch-js`](https://github.com/meilisearch/meilisearch-js) dependency has been released to be compatible with Meilisearch v0.27.0.
  Once the release is out, the upgrade of the `meilisearch-js` dependency might be committed to this branch.

_This PR is auto-generated for the [pre-release week](https://github.com/meilisearch/integration-guides/blob/master/guides/pre-release-week.md) purpose._

_Related to this issue: https://github.com/meilisearch/integration-guides/issues/190_


Co-authored-by: meili-bot <74670311+meili-bot@users.noreply.github.com>
Co-authored-by: meili-bors[bot] <89034592+meili-bors[bot]@users.noreply.github.com>
Co-authored-by: Charlotte Vermandel <charlottevermandel@gmail.com>
  • Loading branch information
3 people authored May 17, 2022
2 parents 1ce4128 + 72bc283 commit 6bd29c0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Each PR should pass the tests and the linter to be accepted.
```bash
# Run a Meilisearch instance
docker pull getmeili/meilisearch:latest # Fetch the latest version of Meilisearch image from Docker Hub
docker run -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --master-key=masterKey --no-analytics
docker run -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key=masterKey --no-analytics

# Tests the project
yarn test # integration tests
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ For example, if you use Docker:

```bash
docker pull getmeili/meilisearch:latest # Fetch the latest version of Meilisearch image from Docker Hub
docker run -it --rm -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --master-key=masterKey
docker run -it --rm -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key=masterKey
```

With this command, your Meilisearch instance `host` is `http://localhost:7700` and your master key is `masterKey`
Expand Down Expand Up @@ -453,7 +453,7 @@ Full usage example:
**Supported Meilisearch versions**:
This package only guarantees the compatibility with the [version v0.26.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.26.0).
This package only guarantees the compatibility with the [version v0.27.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.27.0).
**Node / NPM versions**:
Expand Down
2 changes: 1 addition & 1 deletion tests/index-to-meilisearch.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ describe('Index to Meilisearch', () => {
)
expect(fakeReporter.error).toHaveBeenCalledTimes(1)
expect(fakeReporter.error).toHaveBeenCalledWith(
`Json deserialize error: unknown field \`wrongSettings\`, expected one of \`displayedAttributes\`, \`searchableAttributes\`, \`filterableAttributes\`, \`sortableAttributes\`, \`rankingRules\`, \`stopWords\`, \`synonyms\`, \`distinctAttribute\` at line 1 column 16`
expect.stringMatching(/Json deserialize error: unknown field.*/)
)
expect(activity.setStatus).toHaveBeenCalledTimes(1)
expect(activity.setStatus).toHaveBeenCalledWith(
Expand Down

0 comments on commit 6bd29c0

Please sign in to comment.