Skip to content

Commit 4b1042c

Browse files
committed
ci: Fixed my mistake of removing for long tests instead of short tests
1 parent d5e5380 commit 4b1042c

File tree

1 file changed

+27
-19
lines changed

1 file changed

+27
-19
lines changed

.github/workflows/testing.yml

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -294,31 +294,14 @@ jobs:
294294
test/test_cvedb.py
295295
- name: Run HTML tests
296296
run: pytest -v -n auto test/test_html.py
297-
- name: Cache conda
298-
uses: actions/cache@v3
299-
env:
300-
# Increase to reset cache if requirements.txt file has not changed
301-
CACHE_NUMBER: 0
302-
with:
303-
path: ~/conda_pkgs_dir
304-
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
305-
hashFiles('requirements.txt') }}
306-
- uses: conda-incubator/setup-miniconda@v2
307-
with:
308-
auto-update-conda: true
309-
activate-environment: pdftotext
310-
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
311-
- name: Install pdftotext, reportlab and cve-bin-tool
297+
- name: Install reportlab and cve-bin-tool
312298
run: |
313-
conda install -c conda-forge python=3.10 poppler pdftotext
314299
python -m pip install --upgrade pip
315300
python -m pip install --upgrade setuptools
316301
python -m pip install --upgrade wheel
317302
python -m pip install --upgrade reportlab
318303
python -m pip install --upgrade -r dev-requirements.txt
319304
python -m pip install --upgrade .
320-
- name: Test PDF generation on Windows
321-
run: pytest test/test_output_engine.py -k test_output_pdf
322305
323306
windows_long_tests:
324307
name: Windows long tests
@@ -370,10 +353,35 @@ jobs:
370353
test/test_cvedb.py
371354
- name: Run HTML tests
372355
run: pytest -v -n auto test/test_html.py
356+
- name: Cache conda
357+
uses: actions/cache@v3
358+
env:
359+
# Increase to reset cache if requirements.txt file has not changed
360+
CACHE_NUMBER: 0
361+
with:
362+
path: ~/conda_pkgs_dir
363+
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
364+
hashFiles('requirements.txt') }}
365+
- uses: conda-incubator/setup-miniconda@v2
366+
with:
367+
auto-update-conda: true
368+
activate-environment: pdftotext
369+
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
370+
- name: Install pdftotext, reportlab and cve-bin-tool
371+
run: |
372+
conda install -c conda-forge python=3.9 poppler pdftotext
373+
python -m pip install --upgrade pip
374+
python -m pip install --upgrade setuptools
375+
python -m pip install --upgrade wheel
376+
python -m pip install --upgrade reportlab
377+
python -m pip install --upgrade -r dev-requirements.txt
378+
python -m pip install --upgrade .
379+
- name: Test PDF generation on Windows
380+
run: pytest test/test_output_engine.py -k test_output_pdf --cov --cov-append --cov-report=xml
373381
- name: Upload code coverage to codecov
374382
uses: codecov/codecov-action@v3
375383
with:
376384
files: ./coverage.xml
377385
flags: win-longtests
378386
name: codecov-umbrella
379-
fail_ci_if_error: false
387+
fail_ci_if_error: false

0 commit comments

Comments
 (0)