Skip to content

Commit

Permalink
Fix CI installing incompatible ffi version
Browse files Browse the repository at this point in the history
  • Loading branch information
imjoehaines committed Jun 11, 2024
1 parent 7bf7914 commit 9978f60
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions features/fixtures/delayed_job/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions features/fixtures/rails5/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions features/fixtures/rails7/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 2 additions & 0 deletions features/fixtures/rails_integrations/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down

0 comments on commit 9978f60

Please sign in to comment.