Skip to content

Commit e250a6f

Browse files
Merge #545 #546 #547
545: Update version for the next release (0.6.0-strapi-v3) r=bidoubiwa a=bidoubiwa Next release of Strapi plugin compatible with Strapi v3! 546: Add support information for strapi v3 compatible plugin r=bidoubiwa a=bidoubiwa Provide information on the fact that we: - Do not fix bugs anymore on the strapi v3 plugin, unless critical - Keep the plugin updated with the latest version of meilisearch 547: Update node versions used in CI to 14 when possible r=bidoubiwa a=bidoubiwa Node 12 is EOF, we prefer using node 14 to run the environments. Nonetheless, we keep using node 12 in tests to ensure support of strapi v3 with node 12. Co-authored-by: Charlotte Vermandel <[email protected]>
4 parents f6f55ea + 4eb93d0 + 826256a + 602f3db commit e250a6f

File tree

6 files changed

+40
-43
lines changed

6 files changed

+40
-43
lines changed

.github/workflows/pre-release-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
# Strapi is not yet compatible with node 16
17-
node: ["12", "14"]
17+
node: ['12', '14']
1818
name: integration-tests (Node.js ${{ matrix.node }})
1919
steps:
2020
- uses: actions/checkout@v2
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838
strategy:
3939
matrix:
40-
node: ["12", "14"]
40+
node: ['12', '14']
4141
name: playground-build (Node.js ${{ matrix.node }})
4242
steps:
4343
- uses: actions/checkout@v2
@@ -64,7 +64,7 @@ jobs:
6464
- name: Setup node
6565
uses: actions/setup-node@v2
6666
with:
67-
node-version: "12.x"
67+
node-version: '14.x'
6868
- name: Cache dependencies
6969
uses: actions/cache@v2
7070
with:
@@ -94,7 +94,7 @@ jobs:
9494
- name: Setup node
9595
uses: actions/setup-node@v2
9696
with:
97-
node-version: "12.x"
97+
node-version: '14.x'
9898
- name: Cache dependencies
9999
uses: actions/cache@v2
100100
with:
@@ -110,7 +110,7 @@ jobs:
110110
chmod +x meilisearch
111111
- name: Run Meilisearch
112112
run: |
113-
./meilisearch --master-key=masterKey --no-analytics &
113+
meilisearch --master-key=masterKey --no-analytics &
114114
- name: Install dependencies
115115
run: yarn --dev && yarn --cwd ./playground
116116
- name: Remove plugin symlink

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ name: publish to npm
22
on:
33
push:
44
tags:
5-
- v0.5.*
5+
- v0.*.*-strapi-v3
66

77
jobs:
88
publish-npm:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
12-
- uses: actions/setup-node@v2
11+
- uses: actions/checkout@v3
12+
- uses: actions/setup-node@v3
1313
with:
14-
node-version: 12
14+
node-version: 14
1515
registry-url: https://registry.npmjs.org/
1616
- name: Check release validity
1717
run: sh .github/scripts/check-release.sh

.github/workflows/tests.yml

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515
strategy:
1616
matrix:
1717
# Strapi is not yet compatible with node 16
18-
node: ["12", "14"]
18+
node: ['12', '14']
1919
name: integration-tests (Node.js ${{ matrix.node }})
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222
- name: Setup node
23-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v3
2424
with:
2525
node-version: ${{ matrix.node }}
2626
- name: Cache dependencies
27-
uses: actions/cache@v2
27+
uses: actions/cache@v3
2828
with:
2929
path: |
3030
./node_modules
@@ -38,16 +38,16 @@ jobs:
3838
runs-on: ubuntu-latest
3939
strategy:
4040
matrix:
41-
node: ["12", "14"]
41+
node: ['12', '14']
4242
name: playground-build (Node.js ${{ matrix.node }})
4343
steps:
44-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4545
- name: Setup node
46-
uses: actions/setup-node@v2
46+
uses: actions/setup-node@v3
4747
with:
4848
node-version: ${{ matrix.node }}
4949
- name: Cache dependencies
50-
uses: actions/cache@v2
50+
uses: actions/cache@v3
5151
with:
5252
path: |
5353
./node_modules
@@ -61,13 +61,13 @@ jobs:
6161
runs-on: ubuntu-latest
6262
name: style-check
6363
steps:
64-
- uses: actions/checkout@v2
64+
- uses: actions/checkout@v3
6565
- name: Setup node
66-
uses: actions/setup-node@v2
66+
uses: actions/setup-node@v3
6767
with:
68-
node-version: "12.x"
68+
node-version: '14.x'
6969
- name: Cache dependencies
70-
uses: actions/cache@v2
70+
uses: actions/cache@v3
7171
with:
7272
path: |
7373
./node_modules
@@ -85,30 +85,25 @@ jobs:
8585
# Will still run for each push to bump-meilisearch-v*
8686
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
8787
runs-on: ubuntu-latest
88-
container: cypress/browsers:node12.18.3-chrome87-ff82
88+
container: cypress/browsers:node14.17.0-chrome88-ff89
8989
services:
9090
meilisearch:
9191
image: getmeili/meilisearch:latest
9292
env:
93-
MEILI_MASTER_KEY: "masterKey"
94-
MEILI_NO_ANALYTICS: "true"
93+
MEILI_MASTER_KEY: 'masterKey'
94+
MEILI_NO_ANALYTICS: 'true'
9595
ports:
96-
- "7700:7700"
96+
- '7700:7700'
9797
steps:
9898
- name: Checkout
99-
uses: actions/checkout@v2
100-
- name: Cache dependencies
101-
uses: actions/cache@v2
102-
with:
103-
path: |
104-
./node_modules
105-
key: ${{ hashFiles('yarn.lock') }}
99+
uses: actions/checkout@v3
106100
- name: Setup node
107-
uses: actions/setup-node@v2
101+
uses: actions/setup-node@v3
108102
with:
109-
node-version: "12.x"
103+
node-version: '14.x'
104+
cache: yarn
110105
- name: Cache dependencies
111-
uses: actions/cache@v2
106+
uses: actions/cache@v3
112107
with:
113108
path: |
114109
./playground/node_modules
@@ -130,18 +125,18 @@ jobs:
130125
mv config ./playground/plugins/meilisearch &&
131126
mv services ./playground/plugins/meilisearch &&
132127
cp package.json ./playground/plugins/meilisearch
133-
- name: Test with reloads activated
134-
uses: cypress-io/github-action@v2
128+
- name: Run e2e browser tests
129+
uses: cypress-io/github-action@v3
135130
with:
136131
build: yarn playground:build
137132
start: yarn playground:ci
138133
env: env=ci
139-
- uses: actions/upload-artifact@v2
134+
- uses: actions/upload-artifact@v3
140135
if: failure()
141136
with:
142137
name: cypress-screenshots
143138
path: cypress/screenshots
144-
- uses: actions/upload-artifact@v2
139+
- uses: actions/upload-artifact@v3
145140
if: failure()
146141
with:
147142
name: cypress-videos

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ yarn playground:dev
7373

7474
This command will install required dependencies and launch the app in development mode. You should be able to reach it on the [port 8000 of your localhost](http://localhost:8000/admin/).
7575

76-
Once on the admin panel, you are required to log-in. Here are the credentials:
76+
Once on the admin panel, you are required to log-in. Here are the credentials:
7777
7878
- password: `Qwertyuiop1`
7979

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<img src="https://raw.githubusercontent.com/meilisearch/integration-guides/main/assets/logos/meilisearch_strapi.svg" alt="Meilisearch-Strapi" width="200" height="200" />
33
</p>
44

5-
<h1 align="center">Meilisearch Strapi Plugin</h1>
5+
<h1 align="center">Meilisearch Strapi Plugin v3</h1>
66

77
<h4 align="center">
88
<a href="https://github.com/meilisearch/meilisearch">Meilisearch</a> |
@@ -440,7 +440,9 @@ Complete installation requirements are the same as for Strapi itself and can be
440440

441441
- Strapi `>=v3.6.x <v4.x.x`
442442

443-
(This plugin **may work** with the older Strapi versions, but these are not tested nor officially supported at this time.)
443+
This plugin **may work** with the older Strapi versions, but these are not tested nor officially supported at this time.
444+
445+
⚠️ We do not longer fix bugs on the v3 compatible plugin, unless critical. Nonetheless, we update it to work with the [latest version](https://github.com/meilisearch/meilisearch/releases) of Meilisearch.
444446

445447
**Supported Meilisearch versions**:
446448

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "strapi-plugin-meilisearch",
3-
"version": "0.5.1",
3+
"version": "0.6.0-strapi-v3",
44
"description": "Synchronise and search in your Strapi v3.x.x collections with Meilisearch",
55
"scripts": {
66
"style": "eslint --ext .js .",

0 commit comments

Comments
 (0)