refresh ci

Ibotta · Aug 19, 2024 · 0a8be8e · 0a8be8e
1 parent bbf6e52
commit 0a8be8e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 38 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -6,6 +6,12 @@ on:
   pull_request:
     branches: [master]
 
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 jobs:
   test:
     continue-on-error: true
@@ -15,54 +21,34 @@ jobs:
         image: redis
         ports:
           - 6379:6379
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     strategy:
       fail-fast: false
       matrix:
         ruby-version:
-          - 2.3
-          - 2.4
-          - 2.5
-          - 2.6
-          - 2.7
           - "3.0"
-          - 3.1
-          - 3.2
+          - "3.1"
+          - "3.2"
+          - "3.3"
         resque-version:
           - "master"
-          - "~> 2.4.0"
+          - "~> 2.6"
           - "~> 1.27"
         rufus-scheduler:
-          - "3.2"
-          - "3.4"
-          - "3.5"
-          - "3.6"
+          - "~> 3.6.0"
+          - "~> 3.7.0"
+          - "~> 3.8.0"
+          - "~> 3.9"
         redis-version:
-          - "~> 4.x"
-          - "~> 5.x"
+          - "~> 3.3"
+          - "~> 4.8"
+          - "~> 5.2"
         exclude:
-          - ruby-version: head
-            rufus-scheduler: 3.2
-          - ruby-version: 3.2
-            rufus-scheduler: 3.2
-
-          - ruby-version: 2.3
-            resque-version: "~> 1.27"
-            rufus-scheduler: 3.4
-          - ruby-version: 2.3
-            resque-version: "~> 1.27"
-            rufus-scheduler: 3.5
-          - ruby-version: 2.5
-            resque-version: "~> 2.4.0"
-            rufus-scheduler: 3.5
-          - ruby-version: 2.5
-            resque-version: master
-            rufus-scheduler: 3.2
-
-          - ruby-version: 2.3
-            redis-version: "~> 5.x"
-          - ruby-version: 2.4
-            redis-version: "~> 5.x"
-
           - resque-version: "~> 1.27"
             redis-version: "~> 5.x"
     env:
@@ -71,6 +57,8 @@ jobs:
       RUFUS_SCHEDULER: "${{ matrix.rufus-scheduler }}"
       COVERAGE: 1
 
+    name: "ruby: ${{matrix.ruby-version}}, resque ${{matrix.resque-version}}, rufus-scheduler ${{matrix.rufus-scheduler}}, redis-rb ${{matrix.redis-version}}"
+
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

diff --git a/Gemfile b/Gemfile
@@ -4,13 +4,17 @@ source 'https://rubygems.org'
 case resque_version = ENV.fetch('RESQUE', 'master')
 when 'master'
   gem 'resque', git: 'https://github.com/resque/resque'
+when 'latest'
+  gem 'resque'
 else
   gem 'resque', resque_version
 end
 
-case rufus_scheduler_version = ENV.fetch('RUFUS_SCHEDULER', '3.6')
+case rufus_scheduler_version = ENV.fetch('RUFUS_SCHEDULER', 'latest')
 when 'master'
   gem 'rufus-scheduler', git: 'https://github.com/jmettraux/rufus-scheduler'
+when 'latest'
+  gem 'rufus-scheduler'
 else
   gem 'rufus-scheduler', rufus_scheduler_version
 end