Skip to content

Commit

Permalink
ci: fine-tune files that shouldn't be skipped
Browse files Browse the repository at this point in the history
  • Loading branch information
andreoliwa committed Feb 4, 2024
1 parent 527cb13 commit 54ac963
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 26 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/maturin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ jobs:
with:
# https://github.com/marketplace/actions/skip-duplicate-actions#skip-concurrent-workflow-runs
concurrent_skipping: "same_content_newer"
# https://github.com/marketplace/actions/skip-duplicate-actions#cancel_others
cancel_others: true
# https://github.com/marketplace/actions/skip-duplicate-actions#do_not_skip
do_not_skip: '["workflow_dispatch", "schedule", "merge_group", "release"]'
# https://github.com/marketplace/actions/skip-duplicate-actions#paths
paths: '["Cargo.*", "pyproject.toml", "python/**", "rust/**"]'

linux:
needs: pre_job
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/tox.yml → .github/workflows/tox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ jobs:
with:
# https://github.com/marketplace/actions/skip-duplicate-actions#skip-concurrent-workflow-runs
concurrent_skipping: "same_content_newer"
# https://github.com/marketplace/actions/skip-duplicate-actions#cancel_others
cancel_others: true
# https://github.com/marketplace/actions/skip-duplicate-actions#do_not_skip
do_not_skip: '["workflow_dispatch", "schedule", "merge_group", "release"]'
# https://github.com/marketplace/actions/skip-duplicate-actions#paths
paths: '["Cargo.*", "pyproject.toml", "tox.ini", "python/**", "rust/**", "tests/**"]'

test:
needs: pre_job
Expand Down Expand Up @@ -143,9 +149,8 @@ jobs:
# uses: actions/cache@v3
# with:
# path: .tox
# # setup.cfg and pyproject.toml have versioning info that would
# # impact the tox environment.
# key: tox-${{ matrix.python }}-${{ hashFiles('pyproject.toml', 'setup.cfg') }}
# # These files have versioning info that would impact the tox environment
# key: tox-${{ matrix.python }}-${{ hashFiles('pyproject.toml', 'tox.ini') }}
- name: test
env:
TOXPYTHON: "${{ matrix.toxpython }}"
Expand Down
23 changes: 0 additions & 23 deletions setup.cfg

This file was deleted.

17 changes: 17 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,27 @@ envlist =
ignore_basepython_conflict = true

[pytest]
# If a pytest section is found in one of the possible config files
# (pytest.ini, tox.ini or setup.cfg), then pytest will not look for any others.
env =
LOGSEQ_HOST_URL=http://localhost:1234
LOGSEQ_API_TOKEN=token
LOGSEQ_GRAPH_PATH=~/my-notes
norecursedirs =
migrations

python_files =
test_*.py
*_test.py
tests.py
addopts =
-ra
--strict-markers
--doctest-modules
--doctest-glob=\*.rst
--tb=short
testpaths =
tests

[testenv]
description = Run tests with pytest and coverage
Expand Down

0 comments on commit 54ac963

Please sign in to comment.