Skip to content

Commit 0ccf6e0

Browse files
orforf
committed
Will it blend?
1 parent b4e8399 commit 0ccf6e0

File tree

2 files changed

+91
-29
lines changed

2 files changed

+91
-29
lines changed

‎.github/workflows/test.yml‎

Lines changed: 91 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
name: Run tests
22
on: [push]
33

4-
x-base: &base
5-
steps:
6-
- uses: actions/checkout@master
7-
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
8-
- run: docker-compose pull --include-deps ${{ matrix.compose_app }}
9-
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull ${{ matrix.compose_app }}
10-
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run ${{ matrix.compose_app }}
11-
124
jobs:
135
docs:
146
name: ${{ matrix.compose_app }}
@@ -18,7 +10,12 @@ jobs:
1810
- flake8
1911
- docs
2012
runs-on: ubuntu-latest
21-
<<: *base
13+
steps:
14+
- uses: actions/checkout@master
15+
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
16+
- run: docker-compose pull --include-deps ${{ matrix.compose_app }}
17+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull ${{ matrix.compose_app }}
18+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run ${{ matrix.compose_app }}
2219

2320
sqlite:
2421
name: sqlite
@@ -32,8 +29,31 @@ jobs:
3229
- uses: actions/checkout@master
3330
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
3431
- run: docker-compose pull --include-deps sqlite
35-
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django PYTHON_VERSION=${{ matrix.python_version }} docker-compose build --pull sqlite
36-
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django PYTHON_VERSION=${{ matrix.python_version }} docker-compose run sqlite
32+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull sqlite
33+
env:
34+
PYTHON_VERSION: ${{ matrix.python_version }}
35+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run sqlite
36+
env:
37+
PYTHON_VERSION: ${{ matrix.python_version }}
38+
39+
sqlite-gis:
40+
name: sqlite-gis
41+
strategy:
42+
matrix:
43+
python_version:
44+
- 3.6
45+
- 3.7
46+
runs-on: ubuntu-latest
47+
steps:
48+
- uses: actions/checkout@master
49+
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
50+
- run: docker-compose pull --include-deps sqlite-gis
51+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull sqlite-gis
52+
env:
53+
PYTHON_VERSION: ${{ matrix.python_version }}
54+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run sqlite-gis gis_tests
55+
env:
56+
PYTHON_VERSION: ${{ matrix.python_version }}
3757

3858
postgres:
3959
name: postgres
@@ -61,6 +81,37 @@ jobs:
6181
PYTHON_VERSION: ${{ matrix.python_version }}
6282
POSTGRES_VERSION: ${{ matrix.db_version }}
6383

84+
postgres-gis:
85+
name: postgres-gis
86+
strategy:
87+
matrix:
88+
python_version:
89+
- 3.6
90+
- 3.7
91+
db_version:
92+
- 9.5
93+
- 9.6
94+
- 10
95+
- 11
96+
postgis_version:
97+
- 2.4
98+
- 2.5
99+
runs-on: ubuntu-latest
100+
steps:
101+
- uses: actions/checkout@master
102+
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
103+
- run: docker-compose pull --include-deps postgres-gis
104+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull postgres-gis
105+
env:
106+
PYTHON_VERSION: ${{ matrix.python_version }}
107+
POSTGRES_VERSION: ${{ matrix.db_version }}
108+
POSTGIS_VERSION: ${{ matrix.postgis_version }}
109+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run postgres-gis gis_tests
110+
env:
111+
PYTHON_VERSION: ${{ matrix.python_version }}
112+
POSTGRES_VERSION: ${{ matrix.db_version }}
113+
POSTGIS_VERSION: ${{ matrix.postgis_version }}
114+
64115
mysql:
65116
name: mysql
66117
strategy:
@@ -86,17 +137,43 @@ jobs:
86137
PYTHON_VERSION: ${{ matrix.python_version }}
87138
MYSQL_VERSION: ${{ matrix.db_version }}
88139

140+
mysql-gis:
141+
name: mysql-gis
142+
strategy:
143+
matrix:
144+
python_version:
145+
- 3.6
146+
- 3.7
147+
db_version:
148+
- 5.6
149+
- 5.7
150+
- 8.0
151+
runs-on: ubuntu-latest
152+
steps:
153+
- uses: actions/checkout@master
154+
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
155+
- run: docker-compose pull --include-deps mysql-gis
156+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull mysql-gis
157+
env:
158+
PYTHON_VERSION: ${{ matrix.python_version }}
159+
MYSQL_VERSION: ${{ matrix.db_version }}
160+
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run mysql-gis gis_tests
161+
env:
162+
PYTHON_VERSION: ${{ matrix.python_version }}
163+
MYSQL_VERSION: ${{ matrix.db_version }}
164+
89165
mariadb:
90166
name: mariadb
91167
strategy:
92168
matrix:
93169
python_version:
94170
- 3.6
171+
- 3.7
95172
db_version:
96173
- 10.1
97-
include:
98-
- db_version: 10.3
99-
python_version: 3.7
174+
- 10.2
175+
- 10.3
176+
- 10.4
100177
runs-on: ubuntu-latest
101178
steps:
102179
- uses: actions/checkout@master

‎disabled-.travis.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,8 @@ cache: pip
88

99
env:
1010
# Quick Runs. Lowest supported database and Python version.
11-
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.6
12-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=9.5 POSTGIS_VERSION=2.4
1311
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=5.6
1412

15-
# Sqlite gis:
16-
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.7
17-
18-
# Postgres gis:
19-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=9.6 POSTGIS_VERSION=2.4
20-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=10 POSTGIS_VERSION=2.4
21-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=11 POSTGIS_VERSION=2.5
22-
23-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.7 POSTGRES_VERSION=9.5 POSTGIS_VERSION=2.4
24-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.7 POSTGRES_VERSION=9.6 POSTGIS_VERSION=2.4
25-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.7 POSTGRES_VERSION=10 POSTGIS_VERSION=2.4
26-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.7 POSTGRES_VERSION=11 POSTGIS_VERSION=2.5
27-
2813
# MySQL gis:
2914
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=5.7
3015
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=8.0

0 commit comments

Comments
 (0)