Skip to content

Commit 2b3da43

Browse files
committed
Mariadb?
1 parent dc2f8b6 commit 2b3da43

File tree

2 files changed

+54
-23
lines changed

2 files changed

+54
-23
lines changed

.github/workflows/test.yml

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
python_version:
4040
- 3.6
4141
- 3.7
42-
postgres_version:
42+
db_version:
4343
- 9.5
4444
- 9.6
4545
- 10
@@ -52,8 +52,59 @@ jobs:
5252
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull postgres
5353
env:
5454
PYTHON_VERSION: ${{ matrix.python_version }}
55-
POSTGRES_VERSION: ${{ matrix.postgres_version }}
55+
POSTGRES_VERSION: ${{ matrix.db_version }}
5656
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run postgres
5757
env:
5858
PYTHON_VERSION: ${{ matrix.python_version }}
59-
POSTGRES_VERSION: ${{ matrix.postgres_version }}
59+
POSTGRES_VERSION: ${{ matrix.db_version }}
60+
61+
mysql:
62+
name: mysql
63+
strategy:
64+
matrix:
65+
python_version:
66+
- 3.6
67+
- 3.7
68+
db_version:
69+
- 5.6
70+
- 5.7
71+
- 8.0
72+
runs-on: ubuntu-latest
73+
steps:
74+
- uses: actions/checkout@master
75+
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
76+
- run: docker-compose pull --include-deps mysql
77+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull mysql
78+
env:
79+
PYTHON_VERSION: ${{ matrix.python_version }}
80+
MYSQL_VERSION: ${{ matrix.db_version }}
81+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run mysql
82+
env:
83+
PYTHON_VERSION: ${{ matrix.python_version }}
84+
MYSQL_VERSION: ${{ matrix.db_version }}
85+
86+
mariadb:
87+
name: mariadb
88+
strategy:
89+
matrix:
90+
python_version:
91+
- 3.6
92+
- 3.7
93+
db_version:
94+
- 10.1
95+
- 10.2
96+
- 10.3
97+
- 10.4
98+
runs-on: ubuntu-latest
99+
steps:
100+
- uses: actions/checkout@master
101+
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
102+
- run: docker-compose pull --include-deps mariadb
103+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull mariadb
104+
env:
105+
PYTHON_VERSION: ${{ matrix.python_version }}
106+
MARIADB_VERSION: ${{ matrix.db_version }}
107+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run mariadb
108+
env:
109+
PYTHON_VERSION: ${{ matrix.python_version }}
110+
MARIADB_VERSION: ${{ matrix.db_version }}

disabled-.travis.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ env:
1010
# Quick Runs. Lowest supported database and Python version.
1111
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.6
1212
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=9.5 POSTGIS_VERSION=2.4
13-
- COMPOSE_APP=mysql PYTHON_VERSION=3.6 MYSQL_VERSION=5.6
1413
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=5.6
15-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.1
1614

1715
# Sqlite gis:
1816
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.7
@@ -27,14 +25,6 @@ env:
2725
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.7 POSTGRES_VERSION=10 POSTGIS_VERSION=2.4
2826
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.7 POSTGRES_VERSION=11 POSTGIS_VERSION=2.5
2927

30-
# MySQL:
31-
- COMPOSE_APP=mysql PYTHON_VERSION=3.6 MYSQL_VERSION=5.7
32-
- COMPOSE_APP=mysql PYTHON_VERSION=3.6 MYSQL_VERSION=8.0
33-
34-
- COMPOSE_APP=mysql PYTHON_VERSION=3.7 MYSQL_VERSION=5.6
35-
- COMPOSE_APP=mysql PYTHON_VERSION=3.7 MYSQL_VERSION=5.7
36-
- COMPOSE_APP=mysql PYTHON_VERSION=3.7 MYSQL_VERSION=8.0
37-
3828
# MySQL gis:
3929
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=5.7
4030
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=8.0
@@ -43,16 +33,6 @@ env:
4333
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.7 MYSQL_VERSION=5.7
4434
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.7 MYSQL_VERSION=8.0
4535

46-
# MariaDB:
47-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.2
48-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.3
49-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.4
50-
51-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.1
52-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.2
53-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.3
54-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.4
55-
5636
# Browsers:
5737
- COMPOSE_APP=chrome PYTHON_VERSION=3.6
5838
- COMPOSE_APP=firefox PYTHON_VERSION=3.6

0 commit comments

Comments
 (0)