combine more jobs

Author: crccheck

.github/workflows/ci.yml

@@ -30,25 +30,8 @@ jobs:
       fail-fast: false
       matrix:
         python: ["3.6", "3.7", "3.8", "3.9"]
-    name: "Django 2.2 + Python ${{ matrix.python }}"
-    runs-on: ubuntu-latest
-    env:
-      POETRY_VIRTUALENVS_CREATE: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python }}
-      - run: pip install poetry
-      - run: poetry install
-      - run: poetry add "Django==2.2.*"
-      - run: make test
-  test-dj30:
-    strategy:
-      fail-fast: false
-      matrix:
-        python: ["3.6", "3.7", "3.8", "3.9"]
-    name: "Django 3.0 + Python ${{ matrix.python }}"
+        django: ["2.2.*"]
+    name: "Django ${{ matrix.django }} + Python ${{ matrix.python }}"
     runs-on: ubuntu-latest
     env:
       POETRY_VIRTUALENVS_CREATE: false
@@ -59,14 +42,15 @@ jobs:
           python-version: ${{ matrix.python }}
       - run: pip install poetry
       - run: poetry install
-      - run: poetry add "Django==3.0.*"
+      - run: poetry add "Django==${{ matrix.django }}"
       - run: make test
   test-dj31:
     strategy:
       fail-fast: false
       matrix:
         python: ["3.6", "3.7", "3.8", "3.9"]
-    name: "Django 3.1 + Python ${{ matrix.python }}"
+        django: ["3.0.*", "3.1.*"]
+    name: "Django ${{ matrix.django }} + Python ${{ matrix.python }}"
     runs-on: ubuntu-latest
     env:
       POETRY_VIRTUALENVS_CREATE: false
@@ -77,14 +61,15 @@ jobs:
           python-version: ${{ matrix.python }}
       - run: pip install poetry
       - run: poetry install
-      - run: poetry add "Django==3.1.*"
+      - run: poetry add "Django==${{ matrix.django }}"
       - run: make test
   test-dj32:
     strategy:
       fail-fast: false
       matrix:
         python: ["3.8", "3.9", "3.10"]
-    name: "Django 3.2 + Python ${{ matrix.python }}"
+        django: ["3.2.*"]
+    name: "Django ${{ matrix.django }} + Python ${{ matrix.python }}"
     runs-on: ubuntu-latest
     env:
       POETRY_VIRTUALENVS_CREATE: false
@@ -95,7 +80,7 @@ jobs:
           python-version: ${{ matrix.python }}
       - run: pip install poetry
       - run: poetry install
-      - run: poetry add "Django==3.2.*"
+      - run: poetry add "Django==${{ matrix.django }}"
       - run: make test
 
   lint: