refactor github actions file

gocardless · Aug 8, 2024 · fb78ba2 · fb78ba2
1 parent d738345
commit fb78ba2
Showing 1 changed file with 24 additions and 33 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -3,7 +3,7 @@ name: tests
 on:
   push:
 
-jobs:
+jobs:    
   rubocop:
     runs-on: ubuntu-latest
     env:
@@ -19,12 +19,11 @@ jobs:
         run: |
           bundle exec rubocop --extra-details --display-style-guide --no-server --parallel
 
-  smoke_test:
+  setup:
     strategy:
       fail-fast: false
       matrix:
         ruby_version: ["3.0", "3.1", "3.2", "3.3"]
-
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -40,13 +39,16 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 10
-
     env:
       PGDATABASE: que-test
       PGUSER: ubuntu
       PGPASSWORD: password
       PGHOST: localhost
       BUNDLE_RUBYGEMS__PKG__GITHUB__COM: gocardless-robot-readonly:${{ secrets.GITHUB_TOKEN }}
+
+  smoke_test:
+    needs: setup
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby
@@ -59,27 +61,23 @@ jobs:
           bundle exec bin/que ./lib/que.rb --metrics-port=8080 --ci
 
   rspec:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby_version: ["3.0", "3.1", "3.2", "3.3"]
+    needs: setup
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: "${{ matrix.ruby-version }}"
+      - name: Run specs
+        run: |
+          bundle exec rspec
 
+  active_record_with_lock_adapter_rspec:
+    needs: setup
     runs-on: ubuntu-latest
     services:
-      postgres:
-        image: postgres:14.2
-        env:
-          POSTGRES_DB: que-test
-          POSTGRES_USER: ubuntu
-          POSTGRES_PASSWORD: password
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 10
-
       lock_database:
         image: postgres:14.2
         env:
@@ -92,27 +90,20 @@ jobs:
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
-          --health-retries 10
-      
+          --health-retries 10   
     env:
-      PGDATABASE: que-test
-      PGUSER: ubuntu
-      PGPASSWORD: password
-      PGHOST: localhost
-      BUNDLE_RUBYGEMS__PKG__GITHUB__COM: gocardless-robot-readonly:${{ secrets.GITHUB_TOKEN }}
       LOCK_PGDATABASE: lock-test
       LOCK_PGUSER: ubuntu
       LOCK_PGPASSWORD: password
       LOCK_PGHOST: localhost
+      ADAPTER: ActiveRecordWithLock
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
           ruby-version: "${{ matrix.ruby-version }}"
-      - name: Run specs
-        run: |
-          bundle exec rspec
       - name: Run Specs With ActiveRecordWithLock Adapter
-        run: ADAPTER="ActiveRecordWithLock" bundle exec rspec
+        run:  bundle exec rspec
+