Adjust github actions test workflow

pnuckowski · Oct 21, 2022 · 4de9b73 · 4de9b73
1 parent 4e04760
commit 4de9b73
Showing 1 changed file with 28 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  python-major-version: 3
+
 concurrency:
   group: ci-${{ github.ref }}-${{ github.actor }}
   cancel-in-progress: true
@@ -19,65 +22,65 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp30
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp31
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp32
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp33
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp34
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp35
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp36
-          - python-version: 3.6
+          - python-minor-version: 6
             aiohttp-version: aiohttp37
 
-          - python-version: 3.7
+          - python-minor-version: 7
             aiohttp-version: aiohttp33
-          - python-version: 3.7
+          - python-minor-version: 7
             aiohttp-version: aiohttp34
-          - python-version: 3.7
+          - python-minor-version: 7
             aiohttp-version: aiohttp35
-          - python-version: 3.7
+          - python-minor-version: 7
             aiohttp-version: aiohttp36
-          - python-version: 3.7
+          - python-minor-version: 7
             aiohttp-version: aiohttp37
 
-          - python-version: 3.8
+          - python-minor-version: 8
             aiohttp-version: aiohttp33
-          - python-version: 3.8
+          - python-minor-version: 8
             aiohttp-version: aiohttp34
-          - python-version: 3.8
+          - python-minor-version: 8
             aiohttp-version: aiohttp35
-          - python-version: 3.8
+          - python-minor-version: 8
             aiohttp-version: aiohttp36
-          - python-version: 3.8
+          - python-minor-version: 8
             aiohttp-version: aiohttp37
 
-          - python-version: 3.9
+          - python-minor-version: 9
             aiohttp-version: aiohttp35
-          - python-version: 3.9
+          - python-minor-version: 9
             aiohttp-version: aiohttp36
-          - python-version: 3.9
+          - python-minor-version: 9
             aiohttp-version: aiohttp37
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python ${{ env.python-major-version }}.${{ matrix.python-minor-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: ${{ env.python-major-version }}.${{ matrix.python-minor-version }}
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade pip
         pip install tox
     - name: Run Tests
       run: |
-        tox -e py${{ matrix.python-version }}-${{ matrix.aiohttp-version }}
+        tox -e py${{ env.python-major-version }}${{ matrix.python-version }}-${{ matrix.aiohttp-version }}
     - uses: codecov/codecov-action@v2
       with:
-        file: coverage.xml
+        file: coverage.xml