Merge pull request #3 from alphagov/ci-workflow

Improve CI Github Actions workflow
alphagov · Aug 31, 2023 · bd4c03c · bd4c03c
2 parents c75d05d + 0f03bf5
commit bd4c03c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,3 +1,5 @@
+name: CI
+
 on:
   push:
     branches:
@@ -9,8 +11,18 @@ on:
         description: 'The branch, tag or SHA to checkout'
         default: main
         type: string
+
 jobs:
-  test:
+  lint-ruby:
+    name: Lint Ruby
+    uses: alphagov/govuk-infrastructure/.github/workflows/rubocop.yml@main
+
+  security-analysis:
+    name: Security Analysis
+    uses: alphagov/govuk-infrastructure/.github/workflows/brakeman.yml@main
+
+  test-ruby:
+    name: Test Ruby
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -20,4 +32,3 @@ jobs:
         with:
           bundler-cache: true
       - run: bin/rake
-      - run: bundle exec brakeman
diff --git a/Rakefile b/Rakefile
@@ -5,4 +5,4 @@ require_relative "config/application"
 
 Rails.application.load_tasks
 
-task default: %i[spec rubocop]
+task default: %i[spec]
diff --git a/lib/tasks/rubocop.rake b/lib/tasks/rubocop.rake