Skip to content

Commit

Permalink
fix messages 2
Browse files Browse the repository at this point in the history
  • Loading branch information
tomerm-iguazio committed Jul 25, 2024
1 parent 2e7b1fc commit e364e29
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/push-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: make dev-env
- name: Run unit tests
run: make test-coverage
# in order to get unique identifier we use github.run_id with artifact name.
# In order to get unique identifier we use github.run_id with artifact name.
- name: Upload coverage report
uses: actions/upload-artifact@v4
with:
Expand All @@ -44,7 +44,7 @@ jobs:
V3IO_ACCESS_KEY: ${{ secrets.V3IO_ACCESS_KEY }}
V3IO_FRAMESD: ${{ secrets.V3IO_FRAMESD }}
run: make integration-coverage
# in order to get unique identifier we use github.run_id with artifact name.
# In order to get unique identifier we use github.run_id with artifact name.
- name: Upload coverage report
uses: actions/upload-artifact@v4
with:
Expand All @@ -65,21 +65,23 @@ jobs:
cache: pip
- name: Install dependencies
run: make dev-env
# File name is not effected by the artifact name (=identifier only).
# File name is not effected by the artifact name (=identifier only)
- name: Download unit tests coverage report
uses: actions/download-artifact@v4
with:
name: coverage_unit_tests_report-${{ github.run_id }}
path: coverage_reports/ # where to download. file downloaded by name.
# Where to download. file downloaded by name.
path: coverage_reports/
- name: Download integration coverage report
uses: actions/download-artifact@v4
with:
name: coverage_integration_report-${{ github.run_id }}
path: coverage_reports/ # where to download. file downloaded by name.
# Where to download. file downloaded by name.
path: coverage_reports/
- name: Combine coverage
run: make coverage-combine

# in order to be able to download it from the github run:
# In order to be able to download it from the github run:
- name: Upload coverage combined report
uses: actions/upload-artifact@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ integration-coverage: clean-test
find integration -name '*.pyc' -exec rm {} \;
rm -f coverage_reports/integration.coverage
COVERAGE_FILE=coverage_reports/integration.coverage coverage run --rcfile=tests.coveragerc -m pytest -rf -v integration
@echo "Coverage integration report:"
@echo "Integration test coverage report:"
COVERAGE_FILE=coverage_reports/integration.coverage coverage report --rcfile=tests.coveragerc

.PHONY: env
Expand Down Expand Up @@ -115,7 +115,7 @@ docs: # Build html docs
coverage-combine:
rm -f coverage_reports/combined.coverage
COVERAGE_FILE=coverage_reports/combined.coverage coverage combine --keep coverage_reports/integration.coverage coverage_reports/unit_tests.coverage
@echo "Coverage full report:"
@echo "Full coverage report:"
COVERAGE_FILE=coverage_reports/combined.coverage coverage report --rcfile=tests.coveragerc -i

.PHONY: coverage
Expand Down

0 comments on commit e364e29

Please sign in to comment.