From 57bd094a097ed834fb47584c9b48dfd79206f162 Mon Sep 17 00:00:00 2001 From: Jason Lawrence Date: Tue, 17 Nov 2020 20:28:06 -0600 Subject: [PATCH] Only run claimed tests on merged branches, mark python version used --- .github/workflows/ci.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0b4f1341..78f15fa2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,12 +37,11 @@ jobs: flake8 plexapi --count --max-complexity=12 --max-line-length=127 --statistics pytest-unclaimed: - name: pytest (unclaimed) + name: pytest ${{ matrix.pytest-version }} (unclaimed) needs: lint-flake8 runs-on: ubuntu-latest strategy: matrix: -# python-version: [3.5, 3.6, 3.7, 3.8] python-version: [3.6] steps: @@ -93,12 +92,12 @@ jobs: pytest-claimed: - name: pytest (claimed) + name: pytest ${{ matrix.python-version }} (claimed) needs: pytest-unclaimed + if: github.ref == 'refs/heads/master' runs-on: ubuntu-latest strategy: matrix: -# python-version: [3.5, 3.6, 3.7, 3.8] python-version: [3.6] steps: