settings: rename master to main and container upgrade

.github/workflows/django.yml

@@ -2,19 +2,19 @@ name: Django CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.8'
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
@@ -61,7 +61,7 @@ jobs:
         run: |
           coveralls
       - name: Deploy
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         env:
           TRAVIS_SSH_SECRET: ${{ secrets.DEPLOY }}
         run: |

.travis.yml

@@ -22,7 +22,7 @@ deploy:
 - provider: script
   script: scripts/deploy.sh
   on:
-    branch: master
+    branch: main
 env:
   global:
     secure: "F70LDUxu3HijYWaEYnrxg3iJpc0zHsJmoB6aPjUXgooBOe/qRq2BpGwVNAzbY1Wo5/3MC8pXPyFbXTr01gczOcdUsxlvC6M2dmKrz6AhQ3mAv60GwohF1ngjBixaUvtWNDP/GNUOYzUYhDWNYJNn2NH9OCSRWHzRiHZjJQAwysGRoR21eacOj/2e8norIMIBvBekrSEAxE7z3+s0uBfgHkfkNtBnETyYkzawWMYffwxPFQvBm/SB5lyEZvODLjReF1cqQv/frWPCaUgEZWiNbmnGpq1aUViR5+v410j31pmT4WHQ9Cc9y2wud1vzv4RSfr1u9LbaZqagUSO/HgVdOQSMkxnu7BkENyruhxpitE6WwtoqCjnQWIZhqEdeovluf9aDLEpzDHkFxxDuoj54gx1E0ee+gHG7xzfPRAmXvcjrCXKbnyEYHl2epXg5RVmbPbERoUjZmIteczBT2JKsDZ1mVjMEcLCKHPAxfBdErE67yDQtzvwVaxOzyrRvcTHCtINwR9pisYxs7ZBtJFg9WMzcW8zC2OoCdh1jWIqFNwKWIZEtai5fLc3rtxGxRmbcZ61N7qYNFY8u80T1b6w4CDqVQDI130ppmUj6e6St3pFisaOJQsyHGu9NJFJPSt38TDfEenOSc03DT8VH/tgOrxvsXjCT32UlcWPK9ovWdH4="

README.md

@@ -4,7 +4,7 @@ Civic Europe is a platform for an idea challenge. It is
 based on [adhocracy 4](https://github.com/liqd/adhocracy4).
 
 ![Build Status](https://github.com/liqd/a4-civic-europe/actions/workflows/django.yml/badge.svg)
-[![Coverage Status](https://coveralls.io/repos/github/liqd/a4-civic-europe/badge.svg?branch=master)](https://coveralls.io/github/liqd/a4-civic-europe?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/liqd/a4-civic-europe/badge.svg?branch=main)](https://coveralls.io/github/liqd/a4-civic-europe?branch=main)
 
 ## Requirements
 

scripts/deploy.sh

@@ -19,4 +19,4 @@ EOF
     chmod 600 ~/id_rsa
 fi
 
-ssh ${SSH_ID_ARG} -oServerAliveInterval=15 -oServerAliveCountMax=2 -oStrictHostKeyChecking=no build@build.liqd.net deploy civic_europe master
+ssh ${SSH_ID_ARG} -oServerAliveInterval=15 -oServerAliveCountMax=2 -oStrictHostKeyChecking=no build@build.liqd.net deploy civic_europe main