diff options
| author | James Socol <me@jamessocol.com> | 2022-11-05 16:55:10 -0400 |
|---|---|---|
| committer | James Socol <me@jamessocol.com> | 2022-11-05 16:55:10 -0400 |
| commit | 1f958e84a9e26d8646b3b631a8d609d875ed3547 (patch) | |
| tree | 3ec6ef8d9bbf4fa44bf0593b8ff34784709c7d7d | |
| parent | 8ce382b93c21a1d8bc1ea15f7a100c2039ff8550 (diff) | |
| download | pystatsd-1f958e84a9e26d8646b3b631a8d609d875ed3547.tar.gz | |
Rebase and condense again
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/pr.yml | 20 |
2 files changed, 3 insertions, 21 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 084bd1f..763b0cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,13 +3,15 @@ on: push: branches: - main + pull_request: + types: [opened, synchronize, reopened, ready_for_review] jobs: test: strategy: fail-fast: false matrix: os: [ubuntu-latest] # [macos-latest, ubuntu-latest, windows-latest] - python: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.9'] # Nose fails on Python 3.10+ + python: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.9'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml deleted file mode 100644 index 904644d..0000000 --- a/.github/workflows/pr.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Pull Request -on: - pull_request: - types: [opened, synchronize, reopened, ready_for_review] -jobs: - test: - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] # [macos-latest, ubuntu-latest, windows-latest] - python: ['3.7', '3.8', '3.9', 'pypy-3.9'] # Nose fails on Python 3.10+ - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} - - run: pip install --upgrade pip - - run: pip install tox - - run: tox -e py |