Merge pull request #585 from CTPUG/bugfix/update_django_checks

Bugfix/update django checks
CTPUG · Apr 7, 2021 · 7418096 · 7418096
2 parents 29647d9 + b609538
commit 7418096
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -22,34 +22,35 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
 
-    name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'master' }} )
+    name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }} )
     strategy:
       max-parallel: 4
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
-        django-version: ['2.2.0', '3.0.0', '3.1.0', 'master']
+        django-version: ['2.2.0', '3.0.0', '3.1.0', 'main']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Dependencies
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'master' }}
+      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
       run: |
         python -m pip install --upgrade pip
         pip install psycopg2
         pip install -r requirements.txt -r requirements-dev.txt
     - name: Install Django Release
       run: |
         pip install django~=${{ matrix.django-version }}
-      if: matrix.django-version != 'master'
-    - name: Install Django Master
+      if: matrix.django-version != 'main'
+    - name: Install Django Main
+      continue-on-error: ${{ matrix.django-version == 'main' }}
       run: |
-        pip install 'https://github.com/django/django/archive/master.tar.gz'
-      if: matrix.django-version == 'master'
+        pip install 'https://github.com/django/django/archive/main.tar.gz'
+      if: matrix.django-version == 'main'
     - name: Run Tests
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'master' }}
+      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
       env:
         TESTDB: postgres
       run: |
@@ -59,33 +60,34 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'master' }} )
+    name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }} )
     strategy:
       max-parallel: 4
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
-        django-version: ['2.2.0', '3.0.0', '3.1.0', 'master']
+        django-version: ['2.2.0', '3.0.0', '3.1.0', 'main']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Dependencies
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'master' }}
+      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt -r requirements-dev.txt
         pip install django~=${{ matrix.django-version }}
     - name: Install Django Release
       run: |
         pip install django~=${{ matrix.django-version }}
-      if: matrix.django-version != 'master'
-    - name: Install Django Master
+      if: matrix.django-version != 'main'
+    - name: Install Django Main
+      continue-on-error: ${{ matrix.django-version == 'main' }}
       run: |
-        pip install 'https://github.com/django/django/archive/master.tar.gz'
-      if: matrix.django-version == 'master'
+        pip install 'https://github.com/django/django/archive/main.tar.gz'
+      if: matrix.django-version == 'main'
     - name: Run Tests
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'master' }}
+      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
       run: |
         NOSE_WITH_COVERAGE=1 NOSE_COVER_PACKAGE=wafer python manage.py test