Skip to content

Commit

Permalink
Merge pull request #2029 from Shopify/fix-broken-test-ruby-31
Browse files Browse the repository at this point in the history
Fix broken CI on Ruby 3.1
  • Loading branch information
dirceu authored Oct 2, 2024
2 parents defb823 + 0c40a84 commit f518d0b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ jobs:
matrix:
ruby: ["3.1", "3.2", "3.3", "head"]
rails: ["7.0", "current", "main"]
exclude:
- ruby: "3.1"
rails: "main"
include:
- rails: "main"
experimental: true
Expand Down
4 changes: 3 additions & 1 deletion spec/tapioca/cli/gem_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1530,8 +1530,10 @@ class Application < Rails::Application
# Note that this problem only happens if another gem somehow eager loads the engines. By default, Rails
# would've not loaded those classes and they would have not been placed in the Rails RBI.

# This is pointing to the 7-2-stable branch because Rails 8 dropped support for Ruby 3.1. We can point
# it to main again once Tapioca drops support for Ruby 3.1 as well.
@project.write_gemfile!(<<~GEMFILE, append: true)
gem("rails", git: "https://github.com/rails/rails", branch: "main")
gem("rails", git: "https://github.com/rails/rails", branch: "7-2-stable")
GEMFILE

# Create a gem that eager loads the ActionMailbox engine
Expand Down

0 comments on commit f518d0b

Please sign in to comment.