Merge pull request #230 from saxix/mysql

mysql
saxix · Oct 20, 2021 · 2e51a07 · 2e51a07
2 parents 87d658d + 7baee21
commit 2e51a07
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -28,11 +28,13 @@ jobs:
             matrix:
                 python-version: [ "3.8", "3.9", "3.10"]
                 django-version: [ "2.2", "3.1", "3.2" ]
-                db-engine: [pg, mysql]
+                db-engine: ["pg", "mysql"]
         env:
             PY_VER: ${{ matrix.python-version}}
             DJ_VER: ${{ matrix.django-version}}
-            DB_ENG: ${{ matrix.db-engine}}
+            DBENGINE: ${{ matrix.db-engine}}
+            MYSQL_USER: 'root'
+            MYSQL_PASSWORD: 'root'
 
         services:
           postgres:
@@ -45,9 +47,26 @@ jobs:
               - 5432:5432
             options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
+#          mysql:
+#            image: mysql:5.7
+#            env:
+#              MYSQL_DATABASE: test_db
+#              MYSQL_USER: user
+#              MYSQL_PASSWORD: password
+#              MYSQL_ROOT_PASSWORD: rootpassword
+#            ports:
+#              - 33306:3306
+#            options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
+
         steps:
             - uses: actions/checkout@v2
 
+            -   name: Setup MySQL
+                run: |
+                  sudo /etc/init.d/mysql start
+                  mysql -e 'CREATE DATABASE concurrency;' -uroot -proot
+                  mysql -e 'SHOW DATABASES;' -uroot -proot
+
             -   name: Set up Python ${{ matrix.python-version }}
                 uses: actions/setup-python@v2
                 with:
@@ -57,7 +76,7 @@ jobs:
                 run: python -m pip install --upgrade pip tox
 
             -   name: Test with
-                run: tox -e d${DJ_VER//.}-py${PY_VER//.}-pg
+                run: tox -e d${DJ_VER//.}-py${PY_VER//.}-${DBENGINE}
 
             -   uses: codecov/codecov-action@v1
                 with:

diff --git a/tests/demoapp/demo/settings.py b/tests/demoapp/demo/settings.py
@@ -128,7 +128,7 @@
             'HOST': '127.0.0.1',
             'PORT': '',
             'USER': 'root',
-            'PASSWORD': '',
+            'PASSWORD': 'root',
             'CHARSET': 'utf8',
             'COLLATION': 'utf8_general_ci'}}
 else: