Skip to content

Commit 60e1f7e

Browse files
authored
Merge branch 'main' into bump-meilisearch-v0.25.0
2 parents 91bd2d1 + 2536e39 commit 60e1f7e

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

.github/workflows/tests.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ jobs:
1515
runs-on: ubuntu-18.04
1616
steps:
1717
- uses: actions/checkout@v2
18+
- name: Install pipenv
19+
run: pipx install pipenv
1820
- name: Set up Python 3.8
19-
uses: actions/setup-python@v1
21+
uses: actions/setup-python@v2
2022
with:
2123
python-version: 3.8
22-
- name: Install pipenv
23-
uses: dschep/install-pipenv-action@v1
24+
cache: "pipenv"
2425
- name: Install dependencies
2526
run: pipenv install --dev
2627
- name: Linter with pylint
@@ -35,16 +36,17 @@ jobs:
3536
runs-on: ubuntu-18.04
3637
steps:
3738
- uses: actions/checkout@v2
39+
- name: Install pipenv
40+
run: pipx install pipenv
3841
- name: Set up Python ${{ matrix.python-version }}
39-
uses: actions/setup-python@v1
42+
uses: actions/setup-python@v2
4043
with:
4144
python-version: ${{ matrix.python-version }}
42-
- name: Install pipenv
43-
uses: dschep/install-pipenv-action@v1
45+
cache: "pipenv"
4446
- name: Install dependencies
4547
run: pipenv install --dev
4648
- name: Run tests
47-
run: pipenv run pytest
49+
run: pipenv run pytest -m "not chromedriver"
4850

4951
integration_tests:
5052
strategy:
@@ -55,28 +57,29 @@ jobs:
5557
runs-on: ubuntu-18.04
5658
steps:
5759
- uses: actions/checkout@v2
60+
- name: Install pipenv
61+
run: pipx install pipenv
5862
- name: Set up Python ${{ matrix.python-version }}
59-
uses: actions/setup-python@v1
63+
uses: actions/setup-python@v2
6064
with:
6165
python-version: ${{ matrix.python-version }}
62-
- name: Install pipenv
63-
uses: dschep/install-pipenv-action@v1
66+
cache: "pipenv"
6467
- name: Install dependencies for production only
6568
run: pipenv install
6669
- name: MeiliSearch setup with Docker
6770
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --no-analytics=true --master-key=masterKey
6871
- name: Run the scraper with basic config
6972
run: pipenv run ./docs_scraper $CONFIG_FILE
7073
env:
71-
MEILISEARCH_HOST_URL: 'http://127.0.0.1:7700'
72-
MEILISEARCH_API_KEY: 'masterKey'
73-
CONFIG_FILE: 'tests/config_files_examples/docs-basics.config.json'
74+
MEILISEARCH_HOST_URL: "http://127.0.0.1:7700"
75+
MEILISEARCH_API_KEY: "masterKey"
76+
CONFIG_FILE: "tests/config_files_examples/docs-basics.config.json"
7477
- name: Run the scraper with custom config
7578
run: pipenv run ./docs_scraper $CONFIG_FILE
7679
env:
77-
MEILISEARCH_HOST_URL: 'http://127.0.0.1:7700'
78-
MEILISEARCH_API_KEY: 'masterKey'
79-
CONFIG_FILE: 'tests/config_files_examples/docs-custom.config.json'
80+
MEILISEARCH_HOST_URL: "http://127.0.0.1:7700"
81+
MEILISEARCH_API_KEY: "masterKey"
82+
CONFIG_FILE: "tests/config_files_examples/docs-custom.config.json"
8083

8184
image_build:
8285
name: image-build

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ If you want to know more about the development workflow or want to contribute, p
540540

541541
## Credits
542542

543-
Based on [Algolia's docsearch scraper repository](https://github.com/algolia/docsearch-scraper) from [this commit](https://github.com/curquiza/docsearch-scraper/commit/aab0888989b3f7a4f534979f0148f471b7c435ee).<br>
543+
Based on [Algolia's docsearch scraper repository](https://github.com/algolia/docsearch-scraper) from [this commit](https://github.com/algolia/docsearch-scraper/commit/aab0888989b3f7a4f534979f0148f471b7c435ee).<br>
544544
Due to a lot of future changes on this repository compared to the original one, we don't maintain it as an official fork.
545545

546546
<hr>

0 commit comments

Comments
 (0)