Reorganize CI

.github/workflows/aks_deploy.yml

@@ -43,22 +43,9 @@ jobs:
           docker-repository: ghcr.io/dfe-digital/teaching-school-hub-finder
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-#   brakeman:
-#     name: Run Brakeman vulnerability scanner
-#     uses: ./.github/workflows/brakeman.yml
-#     with:
-#       ruby-version: "3.2.2"
-  brakeman:
-    name: Run brakeman
-    uses: ./.github/workflows/brakeman.yml
-
-  rspec:
-    name: Run the RSpec tests
-    uses: ./.github/workflows/specs.yml
-
   permit-merge:
     name: Permit merge
-    needs: [lint, rspec, cypress]
+    needs: [linting, rspec, brakeman]
     runs-on: ubuntu-latest
     steps:
       - run: "echo 'Linting and tests passed, this branch is ready to be merged'"
@@ -68,7 +55,7 @@ jobs:
     concurrency: deploy_review_${{ github.event.pull_request.number }}
     if: github.actor != 'dependabot[bot]' && github.event_name == 'pull_request'
       # needs: [docker, brakeman] TODO: redo brekeman
-    needs: [docker]
+    needs: [docker, linting]
     runs-on: ubuntu-latest
     environment:
       name: review
@@ -93,7 +80,7 @@ jobs:
 
   deploy_staging:
     name: Deploy staging
-    needs: [docker, rspec, lint, brakeman]
+    needs: [docker, rspec, linting, brakeman]
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     environment: