From 529c7f50731dc318f025fd76d533ca70a2df66a0 Mon Sep 17 00:00:00 2001
From: Alicia <aliciapazrojas@gmail.com>
Date: Tue, 19 Mar 2024 15:48:33 -0600
Subject: [PATCH] Update Github actions workflow

---
 .github/workflows/ruby-ci.yml | 60 ++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ruby-ci.yml b/.github/workflows/ruby-ci.yml
index a4b53dea5..bd0514cca 100644
--- a/.github/workflows/ruby-ci.yml
+++ b/.github/workflows/ruby-ci.yml
@@ -1,15 +1,54 @@
 name: RubyCI
 on:
+  push:
+    branches:
+      - main
+      - develop
   pull_request:
+    branches:
+      - main
+      - develop
     types: [opened, synchronize, reopened, ready_for_review]
 
 env:
-  # Add secret key to Repository secrets
   RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
   DATABASE_URL: postgres://postgres:postgres@localhost:5432/test
   REDIS_URL: redis://localhost:6379/0
-
+ 
 jobs:
+  rubocop: 
+    name: Rubocop
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Run Rubocop
+        run: |
+          bundle exec rubocop
+
+  security:
+    name: Security
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby and install gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Run brakeman
+        run: |
+          bundle exec brakeman -w3
+      - name: Run bundler-audit
+        run: |
+          bundle exec bundle-audit check --update
+
   tests:
     name: Tests
     env:
@@ -59,20 +98,5 @@ jobs:
           bin/yarn install --ignore-engines
       - name: Run tests
         run: |
-          bundle exec rspec --fail-fast -exclude-pattern ./spec/system/admin_organization_system_spec.rb
-
-  security:
-    name: Security
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+          bundle exec rspec --fail-fast
 
-      - name: Setup Ruby and install gems
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - name: Run security checks
-        run: |
-          bundle exec brakeman -w3 -o tmp/brakeman.html