ci: Cleanup ci

.github/workflows/release.yml → .github/workflows/ci-cd.yml

@@ -1,24 +1,40 @@
 ---
-name: Release
+name: CI/CD
+
 on:  # yamllint disable-line rule:truthy
+  pull_request:
+    branches: [ "master", "main" ]
+  push:
+    branches: [ "master", "main" ]
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+
       - uses: actions/checkout@v1
+
       - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
           python-version: 3.9
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install tox
+
       - name: Black with tox
-        run: tox -e black,isort,pylint
+        run: tox -e black
+
+      - name: Isort with tox
+        run: tox -e isort
+
+      - name: Pylint with tox
+        run: tox -e pylint
+
   test:
     runs-on: ubuntu-latest
     strategy:
@@ -27,19 +43,24 @@ jobs:
         python-version: [3.9]
         dj-version: [django40]
     steps:
+
       - uses: actions/checkout@v1
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install tox
+
       - name: Test with tox
         run: |
           PY_VERSION=${{ matrix.python-version }} &&
           tox -e py${PY_VERSION//.}-${{ matrix.dj-version }}
+
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
@@ -48,11 +69,18 @@ jobs:
           flags: unittests
           name: ${{ matrix.python-version }}-${{ matrix.dj-version }}
           yml: ./codecov.yml
-  pip_package:
+
+  release:
+    name: Release
     runs-on: ubuntu-latest
-    needs: [test, lint]
+    timeout-minutes: 10
+    if: github.event_name == 'release'
+    needs:
+      - lint
+      - test
     steps:
       - uses: actions/checkout@v1
+
       - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with: