diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 86187720..144be9e5 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -22,15 +22,15 @@ jobs: gemfiles/Gemfile.rails-5.2.x, gemfiles/Gemfile.rails-6.0.x, gemfiles/Gemfile.rails-6.1.x, - gemfiles/Gemfile.rails-master, + gemfiles/Gemfile.rails-main, ] exclude: # Ruby 3.x is not supported by Rails 5.2.x - ruby_version: 3.0.0 gemfile: gemfiles/Gemfile.rails-5.2.x - # Ruby 2.4.x is not supported by Rails master + # Ruby 2.4.x is not supported by Rails main - ruby_version: 2.4.9 - gemfile: gemfiles/Gemfile.rails-master + gemfile: gemfiles/Gemfile.rails-main # Ruby 2.4.x is not supported by Rails 6.1.x - ruby_version: 2.4.9 gemfile: gemfiles/Gemfile.rails-6.1.x @@ -40,15 +40,15 @@ jobs: # Ruby 2.3.x is not supported by Rails 6.1.x - ruby_version: 2.3.8 gemfile: gemfiles/Gemfile.rails-6.1.x - # Ruby 2.3.x is not supported by Rails master + # Ruby 2.3.x is not supported by Rails main - ruby_version: 2.3.8 - gemfile: gemfiles/Gemfile.rails-master + gemfile: gemfiles/Gemfile.rails-main # Ruby 2.3.x is not supported by Rails 6.0.x - ruby_version: 2.3.8 gemfile: gemfiles/Gemfile.rails-6.0.x - # JRuby is not supported by Rails master + # JRuby is not supported by Rails main - ruby_version: jruby - gemfile: gemfiles/Gemfile.rails-master + gemfile: gemfiles/Gemfile.rails-main runs-on: ubuntu-latest diff --git a/gemfiles/Gemfile.rails-master b/gemfiles/Gemfile.rails-main similarity index 74% rename from gemfiles/Gemfile.rails-master rename to gemfiles/Gemfile.rails-main index c23ce7ec..d04f26ee 100644 --- a/gemfiles/Gemfile.rails-master +++ b/gemfiles/Gemfile.rails-main @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec :path => '..' -gem 'activesupport', github: 'rails/rails', branch: 'master' +gem 'activesupport', github: 'rails/rails', branch: 'main' gem 'mocha', '~> 1.7.0' gem 'test_declarative', '0.0.6' gem 'rake'