Skip to content

Commit ea66e61

Browse files
committed
Ensure node 18 compatibility
1 parent 3fc2665 commit ea66e61

File tree

4 files changed

+25
-22
lines changed

4 files changed

+25
-22
lines changed

.github/workflows/beta-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
node: ['12', '14', '16']
66+
node: ['14', '16', '18']
6767
name: integration-tests (Node.js ${{ matrix.node }})
6868
steps:
6969
- uses: actions/checkout@v3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
node: ['12', '14', '16']
65+
node: ['14', '16', '18']
6666
name: integration-tests (Node.js ${{ matrix.node }})
6767
steps:
6868
- uses: actions/checkout@v3

.github/workflows/tests.yml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Setup node
4141
uses: actions/setup-node@v3
4242
with:
43-
node-version: '14.x'
43+
node-version: 16
4444
cache: yarn
4545
- name: Install dependencies
4646
run: yarn --dev && yarn --cwd ./tests/env/react
@@ -52,7 +52,6 @@ jobs:
5252
wait-on: 'http://localhost:7700'
5353
# Tests are only done on one playground to avoid long testing time
5454
start: yarn local:env:react
55-
browser: chrome
5655
env: playground=local
5756
- uses: actions/upload-artifact@v2
5857
if: failure()
@@ -69,19 +68,26 @@ jobs:
6968
# Will still run for each push to bump-meilisearch-v*
7069
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
7170
runs-on: ubuntu-latest
71+
services:
72+
meilisearch:
73+
image: getmeili/meilisearch:latest
74+
env:
75+
MEILI_MASTER_KEY: 'masterKey'
76+
MEILI_NO_ANALYTICS: 'true'
77+
ports:
78+
- '7700:7700'
7279
strategy:
7380
fail-fast: false
7481
matrix:
75-
node: ['12', '14', '16']
82+
node: ['14', '16', '18']
7683
name: integration-tests (Node.js ${{ matrix.node }})
7784
steps:
7885
- uses: actions/checkout@v3
79-
- name: Cache dependencies
80-
uses: actions/cache@v2
86+
- name: Setup node
87+
uses: actions/setup-node@v3
8188
with:
82-
path: |
83-
./node_modules
84-
key: ${{ hashFiles('yarn.lock') }}
89+
cache: yarn
90+
node-version: ${{ matrix.node }}
8591
- name: Docker setup
8692
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key='masterKey'
8793
- name: Install dependencies
@@ -99,12 +105,11 @@ jobs:
99105

100106
steps:
101107
- uses: actions/checkout@v3
102-
- name: Cache dependencies
103-
uses: actions/cache@v2
108+
- name: Setup node
109+
uses: actions/setup-node@v3
104110
with:
105-
path: |
106-
./node_modules
107-
key: ${{ hashFiles('yarn.lock') }}
111+
node-version: 16
112+
cache: yarn
108113
- name: Install dependencies
109114
run: yarn install
110115
- name: Tests style
@@ -121,14 +126,11 @@ jobs:
121126
name: types-check
122127
steps:
123128
- uses: actions/checkout@v3
124-
- name: Cache dependencies
125-
uses: actions/cache@v2
126-
with:
127-
path: |
128-
./node_modules
129-
key: ${{ hashFiles('yarn.lock') }}
130129
- name: Setup node
131130
uses: actions/setup-node@v3
131+
with:
132+
node-version: 16
133+
cache: yarn
132134
- name: Install dependencies
133135
run: yarn --dev
134136
- name: Build project

bors.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
status = [
22
'style-check',
33
'types-check',
4-
'integration-tests (Node.js 12)',
54
'integration-tests (Node.js 14)',
5+
'integration-tests (Node.js 16)',
6+
'integration-tests (Node.js 18)',
67
'cypress-run'
78
]
89
# 1 hour timeout

0 commit comments

Comments
 (0)