Simplify build matrix

Author: rhpvorderman

.github/workflows/ci.yml

@@ -42,19 +42,17 @@ jobs:
         run: tox -e docs
         env:
           PYTHON_ISAL_LINK_DYNAMIC: True
-  test:
-    runs-on: ubuntu-20.04
+  test-static:
+    needs: lint
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         python-version:
           - 3.6
           - 3.7
           - 3.8
           - 3.9
-        linking_method:
-          - static
-          - dynamic
-    needs: lint
+        os: ["macos-latest", "ubuntu-latest"]
     steps:
       - uses: actions/[email protected]
         with:
@@ -63,41 +61,40 @@ jobs:
         uses: actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install tox and upgrade setuptools and pip
-        run: pip install --upgrade tox setuptools pip
-      - name: Install isal
-        if: ${{ matrix.linking_method == 'dynamic' }}
-        run: sudo apt-get install libisal-dev
-      - name: Install yasm  # Yasm in pypa/manylinux images.
+      - name: Install tox and upgrade setuptools
+        run: pip install --upgrade tox setuptools
+      - name: Install build dependencies (Linux)  # Yasm in pypa/manylinux images.
         run: sudo apt install yasm
-        if: ${{ matrix.linking_method == 'static' }}
-      - name: Run tests (dynamic link)
-        run: tox -e py3
-        env:
-          PYTHON_ISAL_LINK_DYNAMIC: True
-        if: ${{ matrix.linking_method == 'dynamic' }}
-      - name: Run tests (dynamic link)
+        if: runner.os == 'Linux'
+      - name: Install build dependencies (Macos)
+        run: brew install yasm automake autoconf
+        if: runner.os == 'macOS'
+      - name: Run tests
         run: tox -e py3
-        if: ${{ matrix.linking_method == 'static' }}
       - name: Upload coverage report
-        if: ${{ matrix.python-version == 3.6 && matrix.linking_method == 'static'}} # Only upload coverage once
         uses: codecov/codecov-action@v1
 
-  macos:
-    runs-on: macos-latest
+  test-dynamic:
+    runs-on: ${{ matrix.os }}
     needs: lint
+    strategy:
+      matrix:
+        python-version:
+          - 3.6
+        os: ["ubuntu-20.04"]
     steps:
-      - name: Install python 3.6
-        uses: actions/[email protected]
+      - uses: actions/[email protected]
         with:
           submodules: recursive
-      - name: Set up Python 3.6
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/[email protected]
         with:
-          python-version: 3.6
+          python-version: ${{ matrix.python-version }}
+      - name: Install isal
+        run: sudo apt-get install libisal-dev
       - name: Install tox and upgrade setuptools and pip
         run: pip install --upgrade tox setuptools pip
-      - name: Install build dependencies
-        run: brew install yasm automake autoconf
-      - name: Run tests
+      - name: Run tests (dynamic link)
         run: tox -e py3
+        env:
+          PYTHON_ISAL_LINK_DYNAMIC: True