Update Github Actions workflow

4 files changed, 95 insertions, 130 deletions

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
deleted file mode 100644
index 1a8897f..0000000
--- a/.github/workflows/ci-linux.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: Build/test on Linux
-# This workflow is triggered on pushes to the repository.
-on: [push, pull_request]
-
-jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                py: [
-                    '2.7',
-                    '3.5',
-                    '3.6',
-                    '3.7',
-                    '3.8',
-                    'pypy2',
-                    'pypy3'
-                ]
-        name: "Python: ${{ matrix.py }}"
-        steps:
-            - uses: actions/checkout@master
-            - name: Setup python
-              uses: actions/setup-python@v1
-              with:
-                  python-version: ${{ matrix.py }}
-                  architecture: x64
-            - run: pip install tox
-            - name: Running tox
-              run: tox -e py
-    coverage:
-        runs-on: ubuntu-latest
-        name: Validate coverage for Python 2/3
-        steps:
-            - uses: actions/checkout@master
-            - name: Setup python
-              uses: actions/setup-python@v1
-              with:
-                  python-version: 2.7
-                  architecture: x64
-            - name: Setup python
-              uses: actions/setup-python@v1
-              with:
-                  python-version: 3.8
-                  architecture: x64
-            - run: pip install tox
-            - run: tox -e py38,py27,coverage
-    docs:
-        runs-on: ubuntu-latest
-        name: Build the documentation
-        steps:
-            - uses: actions/checkout@master
-            - name: Setup python
-              uses: actions/setup-python@v1
-              with:
-                  python-version: 3.8
-                  architecture: x64
-            - run: pip install tox
-            - run: tox -e docs
-    lint:
-        runs-on: ubuntu-latest
-        name: Lint the package
-        steps:
-            - uses: actions/checkout@master
-            - name: Setup python
-              uses: actions/setup-python@v1
-              with:
-                  python-version: 3.8
-                  architecture: x64
-            - run: pip install tox
-            - run: tox -e lint
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
deleted file mode 100644
index 384bbe6..0000000
--- a/.github/workflows/ci-macos.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Build/test on MacOS
-# This workflow is triggered on pushes to the repository.
-on: [push, pull_request]
-
-jobs:
-    test:
-        runs-on: macOS-latest
-        strategy:
-            matrix:
-                py: [
-                    '2.7',
-                    '3.5',
-                    '3.6',
-                    '3.7',
-                    '3.8',
-                    'pypy2',
-                    'pypy3'
-                ]
-                architecture: ['x64']
-        name: "Python: ${{ matrix.py }}"
-        steps:
-            - uses: actions/checkout@master
-            - name: Setup python
-              uses: actions/setup-python@v1
-              with:
-                  python-version: ${{ matrix.py }}
-                  architecture: ${{ matrix.architecture }}
-            - run: pip install tox
-            - name: Running tox
-              run: |
-                  ulimit -n 4096
-                  tox -e py
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
new file mode 100644
index 0000000..54b229e
--- /dev/null
+++ b/.github/workflows/ci-tests.yml
@@ -0,0 +1,95 @@
+name: Build and test
+
+on:
+    # Only on pushes to master or one of the release branches we build on push
+    push:
+        branches:
+            - master
+            - "[0-9].[0-9]+-branch"
+        tags:
+    # Build pull requests
+    pull_request:
+
+jobs:
+    test:
+        strategy:
+            matrix:
+                py:
+                    - "2.7"
+                    - "3.5"
+                    - "3.6"
+                    - "3.7"
+                    - "3.8"
+                    - "pypy3"
+                os:
+                    - "ubuntu-latest"
+                    - "windows-latest"
+                    - "macos-latest"
+                architecture:
+                    - x64
+                    - x86
+
+                exclude:
+                    # Linux and macOS don't have x86 python
+                    - os: "ubuntu-latest"
+                      architecture: x86
+                    - os: "macos-latest"
+                      architecture: x86
+                    # Building on PyPy3 on Windows is broken
+                    - os: "windows-latest"
+                      py: "pypy3"
+
+        name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
+        runs-on: ${{ matrix.os }}
+        steps:
+            - uses: actions/checkout@v2
+            - name: Setup python
+              uses: actions/setup-python@v2
+              with:
+                  python-version: ${{ matrix.py }}
+                  architecture: ${{ matrix.architecture }}
+            - run: pip install tox
+            - name: Running tox
+              run: tox -e py
+    coverage:
+        runs-on: ubuntu-latest
+        name: Validate coverage
+        steps:
+            - uses: actions/checkout@v2
+            - name: Setup python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: 2.7
+                  architecture: x64
+            - name: Setup python 3.8
+              uses: actions/setup-python@v2
+              with:
+                  python-version: 3.8
+                  architecture: x64
+
+            - run: pip install tox
+            - run: tox -e py38,py27,coverage
+    docs:
+        runs-on: ubuntu-latest
+        name: Build the documentation
+        steps:
+            - uses: actions/checkout@v2
+            - name: Setup python
+              uses: actions/setup-python@v2
+              with:
+                  python-version: 3.8
+                  architecture: x64
+            - run: pip install tox
+            - run: tox -e docs
+    lint:
+        runs-on: ubuntu-latest
+        name: Lint the package
+        steps:
+            - uses: actions/checkout@v2
+            - name: Setup python
+              uses: actions/setup-python@v2
+              with:
+                  python-version: 3.8
+                  architecture: x64
+            - run: pip install tox
+            - run: tox -e lint
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
deleted file mode 100644
index 1e6406f..0000000
--- a/.github/workflows/ci-windows.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build/test on Windows
-# This workflow is triggered on pushes to the repository.
-on: [push, pull_request]
-
-jobs:
-    test:
-        runs-on: windows-2019
-        strategy:
-            matrix:
-                py: [
-                    '2.7',
-                    '3.5',
-                    '3.6',
-                    '3.7',
-                    '3.8'
-                ]
-                architecture: ['x86', 'x64']
-        name: "Python: ${{ matrix.py }} (${{ matrix.architecture }})"
-        steps:
-            - uses: actions/checkout@master
-            - name: Setup python
-              uses: actions/setup-python@v1
-              with:
-                  python-version: ${{ matrix.py }}
-                  architecture: ${{ matrix.architecture }}
-            - run: pip install tox
-            - name: Running tox
-              run: tox -e py