Skip to content

Commit

Permalink
ci: Use simpler caching configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
jpmckinney committed Apr 6, 2022
1 parent 15044f5 commit 4c77196
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,9 @@ jobs:
- uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- id: pip-cache
run: echo "::set-output name=dir::$(pip cache dir)"
- uses: actions/cache@v3
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt', 'setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
cache: pip
cache-dependency-path: setup.py
- run: pip install .[test]
# pytest-vcr uses pyyaml, which warns on pypy-3.7 https://github.com/yaml/pyyaml/issues/534
- run: pytest -W error --cov jscc --vcr-record=none tests
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ jobs:
- uses: actions/setup-python@v3
with:
python-version: 3.8
- uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt', 'setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
cache: pip
cache-dependency-path: setup.py
- run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
- run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
- run: pip install .[test]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def test_validate_ref_pass():
filepath = os.path.join('schema', 'schema.json')

with warnings.catch_warnings():
warnings.simplefilter('error')
warnings.simplefilter('error') # no warnings

errors = validate_ref(path(filepath), parse(filepath))

Expand Down

0 comments on commit 4c77196

Please sign in to comment.