Skip to content

Commit

Permalink
Rename Django's dev branch to main. (#807)
Browse files Browse the repository at this point in the history
* Rename Django's dev branch to main.

More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/
Refs: django/django#14048

* Downgrade to 18.04 to work-around the issue with mysql/mariadb.
  • Loading branch information
jezdez authored Mar 10, 2021
1 parent 0a550c7 commit 9852eea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ on: [push, pull_request]
jobs:
build:
name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9']
django-version: ['2.2', '3.0', '3.1', 'dev']
django-version: ['2.2', '3.0', '3.1', 'main']

exclude:
- python-version: '3.6'
django-version: 'dev'
django-version: 'main'
- python-version: '3.7'
django-version: 'dev'
django-version: 'main'

services:

Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
py{36,37,38,39}-dj{22,30,31}-{sqlite3,postgres,mysql,mariadb},
py{38,39}-dj{dev}-{sqlite3,postgres,mysql,mariadb},
py{38,39}-djmain-{sqlite3,postgres,mysql,mariadb},
docs,
lint

Expand All @@ -17,7 +17,7 @@ DJANGO =
2.2: dj22
3.0: dj30
3.1: dj31
dev: djdev
main: djmain

[flake8]
ignore = N802,F401,W503
Expand All @@ -31,7 +31,7 @@ deps =
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2
djdev: https://github.com/django/django/tarball/master
djmain: https://github.com/django/django/tarball/main
postgres: -rrequirements/postgres.txt
mysql: -rrequirements/mysql.txt
mariadb: -rrequirements/mysql.txt
Expand Down

0 comments on commit 9852eea

Please sign in to comment.