From 224cb24ebc5fcf564c85fef16f4fa2d8ae57ec9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= <jimbrannlund@fastmail.com>
Date: Mon, 17 Jan 2022 09:41:05 +0100
Subject: [PATCH] Use the tests reusable workflow

---
 .github/workflows/actions.yml | 144 ++--------------------------------
 .github/workflows/tests.yml   |   1 +
 2 files changed, 6 insertions(+), 139 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 694076a8..b8696008 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -26,152 +26,18 @@ jobs:
       with:
         python-version: 3.6
     - name: Install tox
-      run: |
-        python -m pip install --upgrade tox
+      run: python -m pip install --upgrade tox
     - name: Build docs with tox
-      run: |
-        python -m tox -e docs
-  build_python:
-    name: ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-18.04
-            name: py36-ubuntu
-            python-version: 3.6
+      run: python -m tox -e docs
 
-          - os: windows-latest
-            name: py36-windows
-            python-version: 3.6
+  tests:
+    uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
 
-          - os: macOS-latest
-            name: py36-mac
-            python-version: 3.6
-
-          - os: ubuntu-18.04
-            name: py37-ubuntu
-            python-version: 3.7
-
-          - os: windows-latest
-            name: py37-windows
-            python-version: 3.7
-
-          - os: macOS-latest
-            name: py37-mac
-            python-version: 3.7
-
-          - os: ubuntu-18.04
-            name: py38-ubuntu
-            python-version: 3.8
-
-          - os: windows-latest
-            name: py38-windows
-            python-version: 3.8
-
-          - os: macOS-latest
-            name: py38-mac
-            python-version: 3.8
-
-          - os: ubuntu-18.04
-            name: py39-ubuntu
-            python-version: 3.9
-
-          - os: windows-latest
-            name: py39-windows
-            python-version: 3.9
-
-          - os: macOS-latest
-            name: py39-mac
-            python-version: 3.9
-
-          - os: ubuntu-18.04
-            name: pypy3-ubuntu
-            python-version: pypy3
-
-          - os: windows-latest
-            name: pypy3-windows
-            python-version: pypy3
-
-           # https://github.com/pytest-dev/pytest-html/issues/482
-#          - os: macOS-latest
-#            name: pypy3-mac
-#            python-version: pypy3
-
-          - os: ubuntu-18.04
-            name: devel-ubuntu
-            python-version: 3.8
-
-    steps:
-    - name: Set Newline Behavior
-      run : |
-        git config --global core.autocrlf false
-    - uses: actions/checkout@master
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix['python-version'] }}
-    - name: Install tox
-      run: |
-        python -m pip install --upgrade tox
-    - name: Get Tox Environment Name From Matrix Name
-      uses: rishabhgupta/split-by@v1
-      id: split-matrix-name
-      with:
-        string: '${{ matrix.name }}'
-        split-by: '-'
-    - name: Test with tox
-      run: |
-        python -m tox -e ${{ steps.split-matrix-name.outputs._0}}-cov
-     # TODO: https://github.com/pytest-dev/pytest-html/issues/481
-#    - name: Upload coverage to codecov
-#      if: github.event.schedule == ''
-#      uses: codecov/codecov-action@v2
-#      with:
-#        fail_ci_if_error: true
-#        file: ./coverage.xml
-#        flags: tests
-#        name: ${{ matrix.py }} - ${{ matrix.os }}
-#        verbose: true
-  build_javascript:
-    name: grunt
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
-    - name: Install Dependencies
-      run: |
-        npm install
-    - name: QUnit Tests
-      run: |
-        npm test
-      env:
-        CI: true
-  linting:
-    name: linting
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.6
-    - name: Install tox
-      run: |
-        python -m pip install --upgrade tox
-    - name: Lint with tox
-      run: |
-        python -m tox -e linting
   publish:
     name: Publish to PyPI registry
     needs:
-      - build_python
-      - build_javascript
+      - tests
     runs-on: ubuntu-latest
-
     env:
       PY_COLORS: 1
       TOXENV: packaging
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2b9c78ef..e550cf58 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -65,6 +65,7 @@ jobs:
           - os: windows-latest
             name: pypy3-windows
             python-version: pypy3
+
            # https://github.com/pytest-dev/pytest-html/issues/482
 #          - os: macOS-latest
 #            name: pypy3-mac