Skip to content

Commit 4ddeb7b

Browse files
mascimasci
authored
chore: fix Windows CI (#3222)
* replicate issue * pin openjdk version * not sure it's needed
1 parent 42c963f commit 4ddeb7b

File tree

1 file changed

+74
-78
lines changed

1 file changed

+74
-78
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 74 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -251,44 +251,41 @@ jobs:
251251
channel: '#haystack'
252252
if: failure() && github.repository_owner == 'deepset-ai' && github.ref == 'refs/heads/main'
253253

254-
# FIXME Disabled due to #3219
255-
# elasticsearch-tests-windows:
256-
# needs:
257-
# - mypy
258-
# - pylint
259-
# runs-on: windows-latest
260-
# if: contains(github.event.pull_request.labels.*.name, 'topic:windows') || !github.event.pull_request.draft
254+
elasticsearch-tests-windows:
255+
needs:
256+
- mypy
257+
- pylint
258+
runs-on: windows-latest
259+
if: contains(github.event.pull_request.labels.*.name, 'topic:windows') || !github.event.pull_request.draft
261260

262-
# steps:
263-
# - uses: actions/checkout@v2
261+
steps:
262+
- uses: actions/checkout@v2
264263

265-
# - name: Set up Elasticsearch and pdftotext
266-
# run: |
267-
# choco install xpdf-utils
268-
# choco install openjdk11
269-
# refreshenv
270-
# choco install elasticsearch --version=7.9.2
271-
# refreshenv
272-
# Get-Service elasticsearch-service-x64 | Start-Service
273-
# - name: Install Haystack
274-
# run: pip install .
264+
- name: Install dependencies
265+
run: |
266+
choco install --no-progress xpdf-utils
267+
choco install --no-progress openjdk --version=11.0.2.01
268+
refreshenv
269+
choco install --no-progress elasticsearch --version=7.9.2
270+
refreshenv
271+
Get-Service elasticsearch-service-x64 | Start-Service
275272
276-
# - name: Setup Python
277-
# uses: ./.github/actions/python_cache/
278-
# with:
279-
# prefix: windows
273+
- name: Setup Python
274+
uses: ./.github/actions/python_cache/
275+
with:
276+
prefix: windows
280277

281-
# - name: Run tests
282-
# env:
283-
# TOKENIZERS_PARALLELISM: 'false'
284-
# run: |
285-
# pytest ${{ env.PYTEST_PARAMS }} -m "elasticsearch and not integration" test/document_stores/ ${{ env.SUITES_EXCLUDED_FROM_WINDOWS }} --document_store_type=elasticsearch
278+
- name: Run tests
279+
env:
280+
TOKENIZERS_PARALLELISM: 'false'
281+
run: |
282+
pytest ${{ env.PYTEST_PARAMS }} -m "elasticsearch and not integration" test/document_stores/ ${{ env.SUITES_EXCLUDED_FROM_WINDOWS }} --document_store_type=elasticsearch
286283
287-
# - uses: act10ns/slack@v1
288-
# with:
289-
# status: ${{ job.status }}
290-
# channel: '#haystack'
291-
# if: failure() && github.repository_owner == 'deepset-ai' && github.ref == 'refs/heads/main'
284+
- uses: act10ns/slack@v1
285+
with:
286+
status: ${{ job.status }}
287+
channel: '#haystack'
288+
if: failure() && github.repository_owner == 'deepset-ai' && github.ref == 'refs/heads/main'
292289

293290
faiss-tests-linux:
294291
needs:
@@ -712,54 +709,53 @@ jobs:
712709
channel: '#haystack'
713710
if: failure() && github.repository_owner == 'deepset-ai' && github.ref == 'refs/heads/main'
714711

715-
# FIXME Disabled due to #3219
716-
# integration-tests-windows:
717-
# needs:
718-
# - unit-tests-windows
719-
# - elasticsearch-tests-windows
720-
# runs-on: windows-latest
721-
# if: contains(github.event.pull_request.labels.*.name, 'topic:windows') || !github.event.pull_request.draft
722-
723-
# timeout-minutes: 30
724-
# strategy:
725-
# fail-fast: false # Avoid cancelling the others if one of these fails
726-
# matrix:
727-
# folder:
728-
# - "nodes"
729-
# - "pipelines"
730-
# - "modeling"
731-
# - "others"
712+
integration-tests-windows:
713+
needs:
714+
- unit-tests-windows
715+
- elasticsearch-tests-windows
716+
runs-on: windows-latest
717+
if: contains(github.event.pull_request.labels.*.name, 'topic:windows') || !github.event.pull_request.draft
732718

733-
# steps:
734-
# - uses: actions/checkout@v2
719+
timeout-minutes: 30
720+
strategy:
721+
fail-fast: false # Avoid cancelling the others if one of these fails
722+
matrix:
723+
folder:
724+
- "nodes"
725+
- "pipelines"
726+
- "modeling"
727+
- "others"
735728

736-
# - name: Set up Elasticsearch and pdftotext
737-
# run: |
738-
# choco install xpdf-utils
739-
# choco install openjdk11
740-
# refreshenv
741-
# choco install tesseract --pre
742-
# choco install elasticsearch --version=7.9.2
743-
# refreshenv
744-
# Get-Service elasticsearch-service-x64 | Start-Service
729+
steps:
730+
- uses: actions/checkout@v2
745731

746-
# - name: Setup Python
747-
# uses: ./.github/actions/python_cache/
748-
# with:
749-
# prefix: windows
732+
- name: Install dependencies
733+
run: |
734+
choco install --no-progress xpdf-utils
735+
choco install --no-progress tesseract
736+
choco install --no-progress openjdk --version=11.0.2.01
737+
refreshenv
738+
choco install --no-progress elasticsearch --version=7.9.2
739+
refreshenv
740+
Get-Service elasticsearch-service-x64 | Start-Service
750741
751-
# - name: Install Haystack
752-
# run: pip install .
742+
- name: Setup Python
743+
uses: ./.github/actions/python_cache/
744+
with:
745+
prefix: windows
753746

754-
# - name: Run tests
755-
# env:
756-
# TOKENIZERS_PARALLELISM: 'false' # Avoid logspam by tokenizers
757-
# # FIXME many tests are disabled here!
758-
# run: |
759-
# pytest ${{ env.PYTEST_PARAMS }} -m "integration and not tika and not graphdb" ${{ env.SUITES_EXCLUDED_FROM_WINDOWS }} test/${{ matrix.folder }} --document_store_type=memory,faiss,elasticsearch
747+
- name: Install Haystack
748+
run: pip install .
760749

761-
# - uses: act10ns/slack@v1
762-
# with:
763-
# status: ${{ job.status }}
764-
# channel: '#haystack'
765-
# if: failure() && github.repository_owner == 'deepset-ai' && github.ref == 'refs/heads/main'
750+
- name: Run tests
751+
env:
752+
TOKENIZERS_PARALLELISM: 'false' # Avoid logspam by tokenizers
753+
# FIXME many tests are disabled here!
754+
run: |
755+
pytest ${{ env.PYTEST_PARAMS }} -m "integration and not tika and not graphdb" ${{ env.SUITES_EXCLUDED_FROM_WINDOWS }} test/${{ matrix.folder }} --document_store_type=memory,faiss,elasticsearch
756+
757+
- uses: act10ns/slack@v1
758+
with:
759+
status: ${{ job.status }}
760+
channel: '#haystack'
761+
if: failure() && github.repository_owner == 'deepset-ai' && github.ref == 'refs/heads/main'

0 commit comments

Comments
 (0)