Consolidate frontend and python CI job into one

wagtail · Sep 27, 2024 · 0dad2f0 · 0dad2f0
1 parent c966f6a
commit 0dad2f0
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,30 +7,27 @@ on:
   pull_request:
 
 jobs:
-  frontend_qa:
+  qa:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'npm'
-      - run: npm ci
-      - run: make lint-frontend
-      - run: make frontend
-
-  python_qa:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
+          cache: 'pip'
+      - run: npm ci
+      - run: make lint-frontend
+      - run: make frontend
       - run: make install-python
       - run: make lint-python
       - run: make test
 
   visual-regression-tests:
+    needs: qa
     runs-on: ubuntu-latest
     env:
       PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}