Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
zhPavel committed Mar 4, 2024
1 parent f8018a0 commit 92e7e02
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/lint_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
just lint

testing:
name: Testing - ${{ matrix.python_version.tox }}
name: Testing (${{ matrix.python_version.tox }}, ${{ matrix.os }})
runs-on: ${{ matrix.os }}
needs: linting

Expand Down Expand Up @@ -85,14 +85,14 @@ jobs:
run:
just inv test-on-ci
--py-target ${{ matrix.python_version.tox }}
--cov-output .coverage.${{ matrix.python_version }}
--cov-output .coverage.${{ matrix.python_version.tox }}

- name: Store coverage file
uses: actions/upload-artifact@v4
if: ${{ matrix.python_version.cov }}
with:
name: coverage-${{ matrix.python_version.setup }}
path: .coverage.${{ matrix.python_version }}
name: coverage-${{ matrix.python_version.tox }}
path: .coverage.${{ matrix.python_version.tox }}
if-no-files-found: error

- name: Run tests without coverage
Expand Down Expand Up @@ -124,10 +124,3 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MERGE_COVERAGE_FILES: true

- name: Store Pull Request comment to be posted
uses: actions/upload-artifact@v4
if: steps.coverage_comment.outputs.COMMENT_FILE_WRITTEN == 'true'
with:
name: python-coverage-comment-action
path: python-coverage-comment-action.txt
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ inv := "inv -r scripts -c invoke_tasks"

@cov:
{{ inv }} cov \
--env-list $(tox list --no-desc | grep -e '^py' | sort -r | tr '\n' ',') \
--env-list $(tox list --no-desc | grep -e '^py' | grep -v '^pypy' | sort -r | tr '\n' ',') \
--output coverage.xml \
--parallel

Expand Down

0 comments on commit 92e7e02

Please sign in to comment.