From 1eb291555b8fee00f1d1055c0cb900acd375d997 Mon Sep 17 00:00:00 2001
From: Matthias <code@mjmair.com>
Date: Fri, 27 May 2022 20:31:59 +0200
Subject: [PATCH] make setup actions more similar

---
 .github/workflows/qc_checks.yaml | 42 +++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/qc_checks.yaml b/.github/workflows/qc_checks.yaml
index 21ce40c2a3..c591c5ed4d 100644
--- a/.github/workflows/qc_checks.yaml
+++ b/.github/workflows/qc_checks.yaml
@@ -66,10 +66,12 @@ jobs:
         with:
           python-version: ${{ env.python_version }}
           cache: 'pip'
-      - name: Install Dependencies
+      - name: Install OS Dependencies
         run: |
           sudo apt-get update
           sudo apt-get install gettext
+      - name: Install Python Dependencies
+        run: |
           pip3 install invoke
           invoke update
       - name: Check Templated Files
@@ -100,10 +102,12 @@ jobs:
         with:
           python-version: ${{ env.python_version }}
           cache: 'pip'
-      - name: Install Dependencies
+      - name: Install OS Dependencies
         run: |
           sudo apt-get update
           sudo apt-get install gettext
+      - name: Install Python Dependencies
+        run: |
           pip3 install invoke
           invoke update
       - name: Check HTML Files
@@ -181,11 +185,13 @@ jobs:
         with:
           python-version: ${{ env.python_version }}
           cache: 'pip'
-      - name: Install Dependencies
+      - name: Install OS Dependencies
         run: |
           sudo apt-get update
           sudo apt-get install gettext
-          python -m pip install -U pip
+      - name: Install Python Dependencies
+        run: |
+          python3 -m pip3 install -U pip3
           pip3 install invoke
           invoke update
       - name: Coverage Tests
@@ -245,14 +251,20 @@ jobs:
         with:
           python-version: ${{ env.python_version }}
           cache: 'pip'
-      - name: Install Dependencies
+      - name: Install OS Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install libpq-dev gettext
-          python -m pip install -U pip
-          pip3 install invoke
+          sudo apt-get install gettext
+
+          sudo apt-get install libpq-dev
+      - name: Install Specific Python Dependencies
+        run: |
           pip3 install psycopg2
           pip3 install django-redis>=5.0.0
+      - name: Install Python Dependencies
+        run: |
+          python3 -m pip3 install -U pip3
+          pip3 install invoke
           invoke update
       - name: Run Tests
         run: invoke test
@@ -303,13 +315,19 @@ jobs:
         with:
           python-version: ${{ env.python_version }}
           cache: 'pip'
-      - name: Install Dependencies
+      - name: Install OS Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install libmysqlclient-dev gettext
-          python -m pip install -U pip
-          pip3 install invoke
+          sudo apt-get install gettext
+
+          sudo apt-get install libmysqlclient-dev
+      - name: Install Specific Python Dependencies
+        run: |
           pip3 install mysqlclient
+      - name: Install Python Dependencies
+        run: |
+          python3 -m pip3 install -U pip3
+          pip3 install invoke
           invoke update
       - name: Run Tests
         run: invoke test