Skip to content

Commit fc4b170

Browse files
bidoubiwabidoubiwa
authored
Merge branch 'main' into cleaning_in_tests
2 parents c424a08 + b50fb65 commit fc4b170

File tree

9 files changed

+187
-222
lines changed

9 files changed

+187
-222
lines changed

‎.github/workflows/beta-tests.yml‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,81 +9,83 @@ on:
99
branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
1010

1111
jobs:
12-
grep-docker-version:
12+
meilisearch-version:
1313
runs-on: ubuntu-latest
1414
outputs:
15-
docker-version: ${{ steps.grep-step.outputs.version }}
15+
version: ${{ steps.grep-step.outputs.version }}
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Grep docker beta version of Meilisearch
1919
id: grep-step
2020
run: |
21-
MEILISEARCH_IMAGE=$(sh .github/scripts/beta-docker-version.sh)
22-
echo $MEILISEARCH_IMAGE
23-
echo ::set-output name=version::$MEILISEARCH_IMAGE
21+
MEILISEARCH_VERSION=$(sh .github/scripts/beta-docker-version.sh)
22+
echo $MEILISEARCH_VERSION
23+
echo ::set-output name=version::$MEILISEARCH_VERSION
2424
cypress-run:
2525
runs-on: ubuntu-latest
26-
needs: ['grep-docker-version']
27-
# Only test on Google Chrome
28-
container: cypress/browsers:node12.18.3-chrome87-ff82
26+
needs: ['meilisearch-version']
27+
services:
28+
meilisearch:
29+
image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
30+
env:
31+
MEILI_MASTER_KEY: 'masterKey'
32+
MEILI_NO_ANALYTICS: 'true'
33+
ports:
34+
- '7700:7700'
35+
name: end-to-end-tests
2936
steps:
3037
- name: Checkout
31-
uses: actions/checkout@v2
32-
- name: Cache dependencies
33-
uses: actions/cache@v2
34-
with:
35-
path: |
36-
./node_modules
37-
key: ${{ hashFiles('yarn.lock') }}
38+
uses: actions/checkout@v3
3839
- name: Setup node
39-
uses: actions/setup-node@v2
40+
uses: actions/setup-node@v3
4041
with:
41-
node-version: '14.x'
42-
- name: Meilisearch (${{ needs.grep-docker-version.outputs.docker-version }}) setup with Docker
43-
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} meilisearch --master-key=masterKey --no-analytics
42+
node-version: 16
43+
cache: yarn
4444
- name: Install dependencies
4545
run: yarn --dev && yarn --cwd ./tests/env/react
4646
- name: Setup Meilisearch Index
4747
run: yarn local:env:setup
4848
- name: Run local browser tests
49-
uses: cypress-io/github-action@v2
49+
uses: cypress-io/github-action@v3
5050
with:
51+
wait-on: 'http://localhost:7700'
5152
# Tests are only done on one playground to avoid long testing time
5253
start: yarn local:env:react
5354
env: playground=local
54-
- uses: actions/upload-artifact@v2
55+
- uses: actions/upload-artifact@v3
5556
if: failure()
5657
with:
5758
name: cypress-screenshots
5859
path: cypress/screenshots
59-
- uses: actions/upload-artifact@v2
60+
- uses: actions/upload-artifact@v3
6061
if: failure()
6162
with:
6263
name: cypress-videos
6364
path: cypress/videos
6465

65-
tests:
66+
integration_tests:
6667
runs-on: ubuntu-latest
67-
needs: ['grep-docker-version']
68+
needs: ['meilisearch-version']
69+
services:
70+
meilisearch:
71+
image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
72+
env:
73+
MEILI_MASTER_KEY: 'masterKey'
74+
MEILI_NO_ANALYTICS: 'true'
75+
ports:
76+
- '7700:7700'
6877
strategy:
6978
fail-fast: false
7079
matrix:
71-
node: ['12', '14', '16']
80+
node: ['14', '16', '18']
7281
name: integration-tests (Node.js ${{ matrix.node }})
7382
steps:
74-
- uses: actions/checkout@v2
75-
- name: Cache dependencies
76-
uses: actions/cache@v2
77-
with:
78-
path: |
79-
./node_modules
80-
key: ${{ hashFiles('yarn.lock') }}
83+
- uses: actions/checkout@v3
8184
- name: Setup node
82-
uses: actions/setup-node@v2
85+
uses: actions/setup-node@v3
8386
with:
84-
node-version: '14.x'
85-
- name: Meilisearch (${{ needs.grep-docker-version.outputs.docker-version }}) setup with Docker
86-
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} meilisearch --master-key=masterKey --no-analytics
87+
cache: yarn
88+
node-version: ${{ matrix.node }}
8789
- name: Install dependencies
8890
run: yarn install
8991
- name: Run tests

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

Lines changed: 45 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -9,116 +9,86 @@ on:
99
branches: [bump-meilisearch-v*]
1010

1111
jobs:
12+
meilisearch-version:
13+
runs-on: ubuntu-latest
14+
outputs:
15+
version: ${{ steps.grep-step.outputs.version }}
16+
steps:
17+
- uses: actions/checkout@v3
18+
- name: Grep docker beta version of Meilisearch
19+
id: grep-step
20+
run: |
21+
MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | sh)
22+
echo $MEILISEARCH_VERSION
23+
echo ::set-output name=version::$MEILISEARCH_VERSION
1224
cypress-run:
1325
runs-on: ubuntu-latest
14-
# Only test on Google Chrome
15-
container: cypress/browsers:node12.18.3-chrome87-ff82
26+
needs: ['meilisearch-version']
27+
services:
28+
meilisearch:
29+
image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
30+
env:
31+
MEILI_MASTER_KEY: 'masterKey'
32+
MEILI_NO_ANALYTICS: 'true'
33+
ports:
34+
- '7700:7700'
35+
name: end-to-end-tests
1636
steps:
1737
- name: Checkout
18-
uses: actions/checkout@v2
19-
- name: Cache dependencies
20-
uses: actions/cache@v2
21-
with:
22-
path: |
23-
./node_modules
24-
key: ${{ hashFiles('yarn.lock') }}
38+
uses: actions/checkout@v3
2539
- name: Setup node
26-
uses: actions/setup-node@v2
40+
uses: actions/setup-node@v3
2741
with:
28-
node-version: "14.x"
42+
node-version: 16
43+
cache: yarn
2944
- name: Install dependencies
3045
run: yarn --dev && yarn --cwd ./tests/env/react
31-
- name: Grep latest version of Meilisearch
32-
run: |
33-
echo "MEILISEARCH_LATEST=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | sh)" >> $GITHUB_ENV
34-
- name: Download Meilisearch
35-
run: |
36-
curl https://github.com/meilisearch/meilisearch/releases/download/${{ env.MEILISEARCH_LATEST }}/meilisearch-linux-amd64 --output meilisearch --location
37-
chmod +x meilisearch
38-
- name: Run Meilisearch
39-
run: |
40-
./meilisearch --master-key=masterKey --no-analytics &
4146
- name: Setup Meilisearch Index
4247
run: yarn local:env:setup
4348
- name: Run local browser tests
4449
uses: cypress-io/github-action@v2
4550
with:
51+
wait-on: 'http://localhost:7700'
4652
# Tests are only done on one playground to avoid long testing time
4753
start: yarn local:env:react
4854
env: playground=local
49-
- uses: actions/upload-artifact@v2
55+
- uses: actions/upload-artifact@v3
5056
if: failure()
5157
with:
5258
name: cypress-screenshots
5359
path: cypress/screenshots
54-
- uses: actions/upload-artifact@v2
60+
- uses: actions/upload-artifact@v3
5561
if: failure()
5662
with:
5763
name: cypress-videos
5864
path: cypress/videos
5965

60-
tests:
66+
integration_tests:
6167
runs-on: ubuntu-latest
68+
needs: ['meilisearch-version']
69+
services:
70+
meilisearch:
71+
image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
72+
env:
73+
MEILI_MASTER_KEY: 'masterKey'
74+
MEILI_NO_ANALYTICS: 'true'
75+
ports:
76+
- '7700:7700'
6277
strategy:
6378
fail-fast: false
6479
matrix:
65-
node: ["12", "14", "16"]
80+
node: ['14', '16', '18']
6681
name: integration-tests (Node.js ${{ matrix.node }})
6782
steps:
68-
- uses: actions/checkout@v2
69-
- name: Cache dependencies
70-
uses: actions/cache@v2
83+
- uses: actions/checkout@v3
84+
- name: Setup node
85+
uses: actions/setup-node@v3
7186
with:
72-
path: |
73-
./node_modules
74-
key: ${{ hashFiles('yarn.lock') }}
75-
- name: Get the latest Meilisearch RC
76-
run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
77-
- name: Meilisearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker
78-
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ env.MEILISEARCH_VERSION }} meilisearch --master-key=masterKey --no-analytics
87+
cache: yarn
88+
node-version: ${{ matrix.node }}
7989
- name: Install dependencies
8090
run: yarn install
8191
- name: Run tests
8292
run: yarn test
8393
- name: Build project
8494
run: yarn build
85-
86-
style:
87-
name: style-check
88-
runs-on: ubuntu-latest
89-
90-
steps:
91-
- uses: actions/checkout@v2
92-
- name: Cache dependencies
93-
uses: actions/cache@v2
94-
with:
95-
path: |
96-
./node_modules
97-
key: ${{ hashFiles('yarn.lock') }}
98-
- name: Install dependencies
99-
run: yarn install
100-
- name: Tests style
101-
run: yarn lint
102-
- name: Yaml Style
103-
uses: ibiqlik/action-yamllint@v3
104-
with:
105-
config_file: .yamllint.yml
106-
types_test:
107-
runs-on: ubuntu-latest
108-
name: types-check
109-
steps:
110-
- uses: actions/checkout@v2
111-
- name: Cache dependencies
112-
uses: actions/cache@v2
113-
with:
114-
path: |
115-
./node_modules
116-
key: ${{ hashFiles('yarn.lock') }}
117-
- name: Setup node
118-
uses: actions/setup-node@v2
119-
- name: Install dependencies
120-
run: yarn --dev
121-
- name: Build project
122-
run: yarn build
123-
- name: Run types check
124-
run: yarn types

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
publish-npm:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
11-
- uses: actions/setup-node@v2
10+
- uses: actions/checkout@v3
11+
- uses: actions/setup-node@v3
1212
with:
13-
node-version: 12
13+
node-version: 16
1414
registry-url: https://registry.npmjs.org/
1515
- name: Check release validity
1616
run: sh .github/scripts/check-release.sh

0 commit comments

Comments
 (0)