From 60b2476498f1100083fe32dbe56ff9f9a765710d Mon Sep 17 00:00:00 2001 From: Joshua Bronson Date: Wed, 23 Mar 2022 20:56:16 +0000 Subject: [PATCH] Minor improvements to GH workflows. --- .../workflows/{pre-commit.yml => lint.yml} | 3 ++- .github/workflows/{tests.yml => test.yml} | 22 ++++++++++--------- tox.ini | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) rename .github/workflows/{pre-commit.yml => lint.yml} (94%) rename .github/workflows/{tests.yml => test.yml} (66%) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/lint.yml similarity index 94% rename from .github/workflows/pre-commit.yml rename to .github/workflows/lint.yml index ea8395a..a756651 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/lint.yml @@ -1,9 +1,10 @@ -name: pre-commit +name: Lint "on": push: branches: - main - dev + - deps pull_request: branches: - main diff --git a/.github/workflows/tests.yml b/.github/workflows/test.yml similarity index 66% rename from .github/workflows/tests.yml rename to .github/workflows/test.yml index 2ff1567..86deac4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Tests +name: Test "on": # quotes ensure this is never parsed as `true` schedule: - cron: "0 11 * * 5" @@ -20,14 +20,16 @@ jobs: include: # See the following link for all available Python versions: # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json - - {name: '3.10', python: '3.10', tox: py310} - - {name: '3.9', python: '3.9', tox: py39} - - {name: '3.8', python: '3.8', tox: py38} - - {name: '3.7', python: '3.7', tox: py37} - - {name: PyPy3.7, python: pypy-3.7, tox: pypy37} - - {name: PyPy3.8, python: pypy-3.8, tox: pypy38} - # - {name: Mac, python: '3.10', tox: py310, os: macos-latest} - # - {name: Windows, python: '3.10', tox: py310, os: windows-latest} + - {name: '3.10', python: '3.10', tox: py310} + - {name: '3.9', python: '3.9', tox: py39} + - {name: '3.8', python: '3.8', tox: py38} + - {name: '3.7', python: '3.7', tox: py37} + - {name: PyPy3.9, python: pypy-3.9, tox: pypy39} + - {name: PyPy3.8, python: pypy-3.8, tox: pypy38} + - {name: PyPy3.7, python: pypy-3.7, tox: pypy37} + # Skip Mac and Windows as nothing in bidict varies by OS. + # - {name: Mac, python: '3.10', tox: py310, os: macos-latest} + # - {name: Windows, python: '3.10', tox: py310, os: windows-latest} steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -50,4 +52,4 @@ jobs: if: matrix.tox == 'py37' || matrix.tox == 'py310' with: verbose: true - fail_ci_if_error: true + fail_ci_if_error: false # https://github.com/codecov/codecov-action/issues/557 diff --git a/tox.ini b/tox.ini index 3fe2f53..5194045 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = py3{10,9,8,7} - pypy3{7,8} + pypy3{9,8,7} lint docs