From 9978f6070c32ead417424a20855313966853e721 Mon Sep 17 00:00:00 2001 From: Joe Haines Date: Mon, 10 Jun 2024 11:47:08 +0100 Subject: [PATCH] Fix CI installing incompatible ffi version --- features/fixtures/delayed_job/app/Gemfile | 2 ++ features/fixtures/rails5/app/Gemfile | 2 ++ features/fixtures/rails7/app/Gemfile | 2 ++ features/fixtures/rails_integrations/app/Gemfile | 2 ++ 4 files changed, 8 insertions(+) diff --git a/features/fixtures/delayed_job/app/Gemfile b/features/fixtures/delayed_job/app/Gemfile index 67ffaa33..7dbd6ed4 100644 --- a/features/fixtures/delayed_job/app/Gemfile +++ b/features/fixtures/delayed_job/app/Gemfile @@ -10,6 +10,8 @@ gem 'delayed_job' gem 'delayed_job_active_record' gem 'mini_racer' +gem 'ffi', RUBY_VERSION >= '3.0' ? '~> 1.17' : '< 1.17' + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.0.7' # Use sqlite3 as the database for Active Record diff --git a/features/fixtures/rails5/app/Gemfile b/features/fixtures/rails5/app/Gemfile index f12882b7..80b3a8f2 100644 --- a/features/fixtures/rails5/app/Gemfile +++ b/features/fixtures/rails5/app/Gemfile @@ -20,6 +20,8 @@ gem 'jbuilder', '~> 2.5' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' +gem 'ffi', RUBY_VERSION >= '3.0' ? '~> 1.17' : '< 1.17' + # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/features/fixtures/rails7/app/Gemfile b/features/fixtures/rails7/app/Gemfile index 239f6f47..ff32122c 100644 --- a/features/fixtures/rails7/app/Gemfile +++ b/features/fixtures/rails7/app/Gemfile @@ -11,6 +11,8 @@ gem "sprockets-rails" # Install a compatible sqlite version on Ruby <3.0 gem "sqlite3", RUBY_VERSION >= '3.0' ? "~> 1.7" : "< 1.7" +gem 'ffi', RUBY_VERSION >= '3.0' ? '~> 1.17' : '< 1.17' + # Use the Puma web server [https://github.com/puma/puma] gem "puma", "~> 5.0" diff --git a/features/fixtures/rails_integrations/app/Gemfile b/features/fixtures/rails_integrations/app/Gemfile index f0daa0f2..d4094f6d 100644 --- a/features/fixtures/rails_integrations/app/Gemfile +++ b/features/fixtures/rails_integrations/app/Gemfile @@ -14,6 +14,8 @@ if RUBY_VERSION >= '3.0.0' gem 'redis-namespace', github: 'resque/redis-namespace', ref: 'c31e63dc3cd5e59ef5ea394d4d46ac60d1e6f82e' end +gem 'ffi', RUBY_VERSION >= '3.0' ? '~> 1.17' : '< 1.17' + gem 'resque', '~> 2.0' gem 'sidekiq', '~> 6.1'