Merge pull request #1155 from tildeio/test-sidekiq-8-sinatra-4

Test sidekiq 8, sinatra 4, grape 2

Author: zvkemp

.github/workflows/build.yml

@@ -11,7 +11,7 @@ env:
   RAILS_ENV: development
   EMBEDDED_HTTP_SERVER_TIMEOUT: '30'
   WORKER_SPAWN_TIMEOUT: '15'
-  CONFIG_DIGEST: d02685daad5f72653e1a4cb618d0e01ce9c0e801e03a3b76109e0d200e373cca
+  CONFIG_DIGEST: 444c64919a840b6bbeded52d4d4bcc6285b3e6e6e0da9e09158aa4d0d87d201d
 'on':
   push:
     branches:
@@ -215,6 +215,51 @@ jobs:
       run: bundle exec rake
     needs:
     - ruby-3-4-default
+  ruby-3-4-sidekiq-7-x:
+    name: ruby 3.4, sidekiq-7.x
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name,
+      'full-ci') || contains(github.event.pull_request.labels.*.name, 'sidekiq-7.x')
+    services:
+      redis:
+        image: redis
+        ports:
+        - 6379:6379
+        options: "--entrypoint redis-server"
+    env:
+      BUNDLE_GEMFILE: gemfiles/sidekiq-7.x/Gemfile
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Setup ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.4'
+    - name: Install APT dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -yq sqlite3 libsqlite3-dev
+    - name: Setup cache (bundler)
+      uses: actions/cache@v3
+      with:
+        path: "${{ github.workspace }}/vendor/bundle"
+        key: "${{ runner.os }}-gems-3.4-sidekiq-7.x-${{ hashFiles('gemfiles/sidekiq-7.x/Gemfile.lock')
+          }}"
+        restore-keys: |-
+          ${{ runner.os }}-gems-3.4-sidekiq-7.x-
+          ${{ runner.os }}-gems-3.4-
+    - name: bundle install
+      run: "gem install bundler \nbundle install\n"
+    - name: Run tests
+      run: |
+        bundle exec rake workflow:verify[$CONFIG_DIGEST]
+        bundle exec rake
+    - name: Run tests (agent disabled)
+      env:
+        SKYLIGHT_DISABLE_AGENT: 'true'
+      run: bundle exec rake
+    needs:
+    - ruby-3-4-default
   ruby-3-2-graphql-2-0-17:
     name: ruby 3.2, graphql-2.0.17
     runs-on: ubuntu-latest
@@ -582,11 +627,11 @@ jobs:
       run: bundle exec rake
     needs:
     - ruby-3-4-default
-  ruby-3-4-grape-1-x:
-    name: ruby 3.4, grape-1.x
+  ruby-3-4-grape-2-x:
+    name: ruby 3.4, grape-2.x
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name,
-      'full-ci') || contains(github.event.pull_request.labels.*.name, 'grape-1.x')
+      'full-ci') || contains(github.event.pull_request.labels.*.name, 'grape-2.x')
       || !contains(github.event.pull_request.labels.*.name, 'dependencies')
     services:
       redis:
@@ -595,7 +640,7 @@ jobs:
         - 6379:6379
         options: "--entrypoint redis-server"
     env:
-      BUNDLE_GEMFILE: gemfiles/grape-1.x/Gemfile
+      BUNDLE_GEMFILE: gemfiles/grape-2.x/Gemfile
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -611,10 +656,10 @@ jobs:
       uses: actions/cache@v3
       with:
         path: "${{ github.workspace }}/vendor/bundle"
-        key: "${{ runner.os }}-gems-3.4-grape-1.x-${{ hashFiles('gemfiles/grape-1.x/Gemfile.lock')
+        key: "${{ runner.os }}-gems-3.4-grape-2.x-${{ hashFiles('gemfiles/grape-2.x/Gemfile.lock')
           }}"
         restore-keys: |-
-          ${{ runner.os }}-gems-3.4-grape-1.x-
+          ${{ runner.os }}-gems-3.4-grape-2.x-
           ${{ runner.os }}-gems-3.4-
     - name: bundle install
       run: "gem install bundler \nbundle install\n"
@@ -1008,13 +1053,14 @@ jobs:
     - ruby-3-2-rails-7-1-x-mongo
     - ruby-3-2-elasticsearch-elasticsearch
     - ruby-3-1-sidekiq-5-x
+    - ruby-3-4-sidekiq-7-x
     - ruby-3-2-graphql-2-0-17
     - ruby-3-1-rails-7-1-x
     - ruby-3-2-rails-7-1-x
     - ruby-3-2-rails-7-2-x
     - ruby-3-4-sinatra-2-x
     - ruby-3-1-grape-1-x
-    - ruby-3-4-grape-1-x
+    - ruby-3-4-grape-2-x
     - ruby-3-1-sequel-4
     - ruby-3-4-sequel-5
     - ruby-3-1-ams-0-9-x

CHANGELOG.md

@@ -3,6 +3,7 @@
 - IMPROVEMENT Initial support for AWS Lambda
 - BREAKING end support for Ruby 2.7 and 3.0
 - BREAKING end support for Rails < 7.1
+- BUGFIX Fix an issue handling deserialization errors in Delayed::Job
 
 ## 6.1.0.beta (June 11, 2024)
 

Gemfile

@@ -6,7 +6,7 @@ ruby ">= 2.7"
 
 gem "grape", "~> 2.2.0"
 gem "rails", "~> 8.0.0"
-gem "sinatra", "~> 3.0.0"
+gem "sinatra", "~> 4"
 
 eval_gemfile "./gemfiles/Gemfile.additional"
 

gemfiles/Gemfile.additional

@@ -8,7 +8,7 @@ gem "graphql", "~> 2.5.0"
 gem "httpclient"
 gem "rexml"
 gem "sequel", "> 0"
-gem "sidekiq", "< 8"
+gem "sidekiq", ENV['SIDEKIQ_VERSION'] || "~> 8"
 gem "sqlite3", "~> 2.1.0"
 gem "tilt"
 gem "haml"

gemfiles/grape-2.x/Gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gemspec path: "../.."
+
+gem "grape", "~> 2"
+
+# Test additional libraries with oldest and newest versions of Grape
+eval_gemfile "../Gemfile.additional"

gemfiles/sidekiq-7.x/Gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gemspec path: "../.."
+
+# TODO: Check if we need Rails
+gem "rails", "~> 7.1.0"
+gem "sidekiq", "~> 7"
+gem "sqlite3", "~> 2"

gemfiles/sinatra-2.x/Gemfile

@@ -4,5 +4,6 @@ gemspec path: "../.."
 
 gem "sinatra", "~> 2"
 
+ENV['SIDEKIQ_VERSION'] = "~> 7"
 # Test additional libraries with oldest and newest versions of Sintra
 eval_gemfile "../Gemfile.additional"

lib/tasks/workflow.rake

@@ -71,6 +71,14 @@ module CITasks
         { "dependency-name": "sidekiq", versions: [">= 6"] },
       ]
     },
+    "sidekiq-7.x" => {
+      allow: [
+        { "dependency-name": "sidekiq" },
+      ],
+      ignore: [
+        { "dependency-name": "sidekiq", versions: [">= 8"] },
+      ]
+    },
     "sinatra-2.x" => {
       allow: [{ "dependency-name": "sinatra" }]
       # We don't limit this so that we're aware when new versions are released
@@ -118,6 +126,7 @@ module CITasks
       }
     },
     { ruby_version: OLDEST_RUBY, gemfile: "sidekiq-5.x" },
+    { ruby_version: NEWEST_RUBY, gemfile: "sidekiq-7.x" },
     # We need to test either 1.8 or 1.9 since there are more changes in 1.10.
     # We probably don't need to test both
 
@@ -138,8 +147,7 @@ module CITasks
     { always_run: true, ruby_version: NEWEST_RUBY, gemfile: "sinatra-2.x" },
     { ruby_version: NEWEST_RUBY, allow_failure: true, gemfile: "sinatra-edge" },
     { ruby_version: OLDEST_RUBY, gemfile: "grape-1.x" },
-    { always_run: true, ruby_version: NEWEST_RUBY, gemfile: "grape-1.x" },
-    # Oldest supported grape version. Doesn't support 3.0.
+    { always_run: true, ruby_version: NEWEST_RUBY, gemfile: "grape-2.x" },
     { ruby_version: NEWEST_RUBY, allow_failure: true, gemfile: "grape-edge" },
     { ruby_version: "3.1", gemfile: "sequel-4" },
     { ruby_version: NEWEST_RUBY, gemfile: "sequel-5" },

spec/integration/probes/sinatra_spec.rb

@@ -16,6 +16,7 @@
         "SinatraTest",
         Class.new(::Sinatra::Base) do
           disable :show_exceptions
+          set :host_authorization, { permitted_hosts: [] }
 
           template :hello do
             "Hello from named template"

spec/unit/sidekiq_spec.rb

@@ -12,11 +12,15 @@
   module Skylight
     describe "Sidekiq" do
       def server_middleware
-        sidekiq_7? ? ::Sidekiq.default_configuration.server_middleware : ::Sidekiq.server_middleware
+        sidekiq_gte_7? ? ::Sidekiq.default_configuration.server_middleware : ::Sidekiq.server_middleware
       end
 
-      def sidekiq_7?
-        ::Sidekiq::VERSION =~ /\A7/
+      def sidekiq_gte_7?
+        sidekiq_version >= Gem::Version.new("7")
+      end
+
+      def sidekiq_version
+        Gem::Version.new(::Sidekiq::VERSION)
       end
 
       after :each do