diff options
| -rw-r--r-- | .github/workflows/pytest.yml | 2 | ||||
| -rw-r--r-- | .mergify.yml | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index abf2178..ef2cfe7 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -9,7 +9,7 @@ on: pull_request: jobs: - test: + pytest: runs-on: ${{ matrix.os }} strategy: diff --git a/.mergify.yml b/.mergify.yml index 15860c7..1bbffc0 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,15 +6,15 @@ pull_request_rules: - name: Automatic merge on approval conditions: - "#approved-reviews-by>=1" - - "status-success=test (ubuntu-latest, 3.7)" - - "status-success=test (ubuntu-latest, 3.8)" - - "status-success=test (ubuntu-latest, 3.9)" - - "status-success=test (macos-latest, 3.7)" - - "status-success=test (macos-latest, 3.8)" - - "status-success=test (macos-latest, 3.9)" - - "status-success=test (windows-latest, 3.7)" - - "status-success=test (windows-latest, 3.8)" - - "status-success=test (windows-latest, 3.9)" + - "status-success=pytest (ubuntu-latest, 3.7)" + - "status-success=pytest (ubuntu-latest, 3.8)" + - "status-success=pytest (ubuntu-latest, 3.9)" + - "status-success=pytest (macos-latest, 3.7)" + - "status-success=pytest (macos-latest, 3.8)" + - "status-success=pytest (macos-latest, 3.9)" + - "status-success=pytest (windows-latest, 3.7)" + - "status-success=pytest (windows-latest, 3.8)" + - "status-success=pytest (windows-latest, 3.9)" - "status-success=pre-commit" actions: merge: @@ -22,15 +22,15 @@ pull_request_rules: - name: Automatic merge from Flameeyes conditions: - "author=Flameeyes" - - "status-success=test (ubuntu-latest, 3.7)" - - "status-success=test (ubuntu-latest, 3.8)" - - "status-success=test (ubuntu-latest, 3.9)" - - "status-success=test (macos-latest, 3.7)" - - "status-success=test (macos-latest, 3.8)" - - "status-success=test (macos-latest, 3.9)" - - "status-success=test (windows-latest, 3.7)" - - "status-success=test (windows-latest, 3.8)" - - "status-success=test (windows-latest, 3.9)" + - "status-success=pytest (ubuntu-latest, 3.7)" + - "status-success=pytest (ubuntu-latest, 3.8)" + - "status-success=pytest (ubuntu-latest, 3.9)" + - "status-success=pytest (macos-latest, 3.7)" + - "status-success=pytest (macos-latest, 3.8)" + - "status-success=pytest (macos-latest, 3.9)" + - "status-success=pytest (windows-latest, 3.7)" + - "status-success=pytest (windows-latest, 3.8)" + - "status-success=pytest (windows-latest, 3.9)" - "status-success=pre-commit" actions: merge: |