From e9a9a3e444d21a93127306945d6a9683187ea222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksi=20H=C3=A4kli?= <aleksi.hakli@iki.fi>
Date: Wed, 6 Jan 2021 15:19:25 +0200
Subject: [PATCH] Fix CI matrix definition for tox-gh-actions

---
 .github/workflows/test.yml |  1 +
 tox.ini                    | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f78db2c..ec786e7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
+    name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
diff --git a/tox.ini b/tox.ini
index ef4c7ed..9d189d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,14 @@ python =
     3.9: py39
     pypy3: pypy3
 
+[gh-actions:env]
+DJANGO =
+    2.2: dj22
+    3.0: dj30
+    3.1: dj31
+    dev: djdev
+    qa: qa
+
 [testenv]
 deps =
     -r requirements-test.txt
@@ -27,7 +35,7 @@ setenv =
 ignore_errors = true
 ignore_outcome = true
 
-[testenv:py38-djqa]
+[testenv:py38-qa]
 deps = -r requirements-qa.txt
 commands =
     mypy axes